diff --git a/.gitignore b/.gitignore index 3229f09..2fdd648 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ doc/specs.html doc/features.html rerun.txt *signal-auth* +db/schema.rb diff --git a/Gemfile b/Gemfile index c6d8819..a2febfb 100644 --- a/Gemfile +++ b/Gemfile @@ -13,6 +13,7 @@ gem 'friendly_id', '>=3.1.8' gem 'delayed_job', '>=2.1' gem "compass", ">= 0.10.2" gem "daemons" +gem "devise", "= 1.2.rc2" gem 'inploy', '>=1.6.8' diff --git a/Gemfile.lock b/Gemfile.lock index 42c43b4..707e341 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -32,6 +32,7 @@ GEM arel (2.0.6) arrayfields (4.7.4) babosa (0.2.0) + bcrypt-ruby (2.1.4) builder (2.1.2) capybara (0.4.0) celerity (>= 0.7.9) @@ -71,6 +72,10 @@ GEM delayed_job (2.1.2) activesupport (~> 3.0) daemons + devise (1.2.rc2) + bcrypt-ruby (~> 2.1.2) + orm_adapter (~> 0.0.3) + warden (~> 1.0.3) diff-lcs (1.1.2) erubis (2.6.6) abstract (>= 1.0.0) @@ -141,6 +146,7 @@ GEM mutter (0.5.3) mysql (2.8.1) nokogiri (1.4.4) + orm_adapter (0.0.4) pickle (0.4.3) cucumber (>= 0.8) rake @@ -223,6 +229,8 @@ GEM treetop (1.4.9) polyglot (>= 0.3.1) tzinfo (0.3.23) + warden (1.0.3) + rack (>= 1.0.0) webrat (0.7.2) nokogiri (>= 1.2.0) rack (>= 1.0) @@ -242,6 +250,7 @@ DEPENDENCIES daemons database_cleaner delayed_job (>= 2.1) + devise (= 1.2.rc2) factory_girl_rails faker formtastic (>= 1.1.0) diff --git a/app/controllers/builds_controller.rb b/app/controllers/builds_controller.rb index caa16ca..0a13772 100644 --- a/app/controllers/builds_controller.rb +++ b/app/controllers/builds_controller.rb @@ -1,3 +1,4 @@ class BuildsController < InheritedResources::Base + before_filter :authenticate_user! belongs_to :project end diff --git a/app/controllers/deploys_controller.rb b/app/controllers/deploys_controller.rb index 66f7492..22ebf4f 100644 --- a/app/controllers/deploys_controller.rb +++ b/app/controllers/deploys_controller.rb @@ -1,3 +1,4 @@ class DeploysController < InheritedResources::Base + before_filter :authenticate_user! belongs_to :project end diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index fb2ff95..73e629a 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -1,4 +1,5 @@ class ProjectsController < InheritedResources::Base + before_filter :authenticate_user!, :except => [:show, :index, :fetch_status] respond_to :html, :xml, :rss def build diff --git a/app/models/user.rb b/app/models/user.rb new file mode 100644 index 0000000..b2f7c8e --- /dev/null +++ b/app/models/user.rb @@ -0,0 +1,9 @@ +class User < ActiveRecord::Base + # Include default devise modules. Others available are: + # :token_authenticatable, :encryptable, :confirmable, :lockable, :timeoutable and :omniauthable + devise :database_authenticatable, :registerable, + :recoverable, :rememberable, :trackable, :validatable + + # Setup accessible (or protected) attributes for your model + attr_accessible :email, :password, :password_confirmation, :remember_me +end diff --git a/config/deploy.rb b/config/deploy.rb deleted file mode 100644 index 390ee4f..0000000 --- a/config/deploy.rb +++ /dev/null @@ -1,7 +0,0 @@ -application = "signal" -repository = 'git://github.com/dcrec1/signal.git' -hosts = [] - -before_restarting_server do - run "script/delayed_job -e production restart" -end diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb new file mode 100644 index 0000000..844b486 --- /dev/null +++ b/config/initializers/devise.rb @@ -0,0 +1,185 @@ +# Use this hook to configure devise mailer, warden hooks and so forth. The first +# four configuration values can also be set straight in your models. +Devise.setup do |config| + # ==> Mailer Configuration + # Configure the e-mail address which will be shown in DeviseMailer. + config.mailer_sender = "please-change-me@config-initializers-devise.com" + + # Configure the class responsible to send e-mails. + # config.mailer = "Devise::Mailer" + + # ==> ORM configuration + # Load and configure the ORM. Supports :active_record (default) and + # :mongoid (bson_ext recommended) by default. Other ORMs may be + # available as additional gems. + require 'devise/orm/active_record' + + # ==> Configuration for any authentication mechanism + # Configure which keys are used when authenticating a user. The default is + # just :email. You can configure it to use [:username, :subdomain], so for + # authenticating a user, both parameters are required. Remember that those + # parameters are used only when authenticating and not when retrieving from + # session. If you need permissions, you should implement that in a before filter. + # You can also supply a hash where the value is a boolean determining whether + # or not authentication should be aborted when the value is not present. + # config.authentication_keys = [ :email ] + + # Configure parameters from the request object used for authentication. Each entry + # given should be a request method and it will automatically be passed to the + # find_for_authentication method and considered in your model lookup. For instance, + # if you set :request_keys to [:subdomain], :subdomain will be used on authentication. + # The same considerations mentioned for authentication_keys also apply to request_keys. + # config.request_keys = [] + + # Configure which authentication keys should be case-insensitive. + # These keys will be downcased upon creating or modifying a user and when used + # to authenticate or find a user. Default is :email. + config.case_insensitive_keys = [ :email ] + + # Tell if authentication through request.params is enabled. True by default. + # config.params_authenticatable = true + + # Tell if authentication through HTTP Basic Auth is enabled. False by default. + # config.http_authenticatable = false + + # If http headers should be returned for AJAX requests. True by default. + # config.http_authenticatable_on_xhr = true + + # The realm used in Http Basic Authentication. "Application" by default. + # config.http_authentication_realm = "Application" + + # ==> Configuration for :database_authenticatable + # For bcrypt, this is the cost for hashing the password and defaults to 10. If + # using other encryptors, it sets how many times you want the password re-encrypted. + config.stretches = 10 + + # Setup a pepper to generate the encrypted password. + # config.pepper = "fd2646c1415b9ba8f7e8e7b3b37583a41a8c9f18bc79ac56beb23e54f5204f56ae8387d8fbb8581ca6886ddbf9d169f3549348649cc344b2b865249e8d282e62" + + # ==> Configuration for :confirmable + # The time you want to give your user to confirm his account. During this time + # he will be able to access your application without confirming. Default is 0.days + # When confirm_within is zero, the user won't be able to sign in without confirming. + # You can use this to let your user access some features of your application + # without confirming the account, but blocking it after a certain period + # (ie 2 days). + # config.confirm_within = 2.days + + # Defines which key will be used when confirming an account + # config.confirmation_keys = [ :email ] + + # ==> Configuration for :rememberable + # The time the user will be remembered without asking for credentials again. + # config.remember_for = 2.weeks + + # If true, a valid remember token can be re-used between multiple browsers. + # config.remember_across_browsers = true + + # If true, extends the user's remember period when remembered via cookie. + # config.extend_remember_period = false + + # If true, uses the password salt as remember token. This should be turned + # to false if you are not using database authenticatable. + config.use_salt_as_remember_token = true + + # ==> Configuration for :validatable + # Range for password length. Default is 6..20. + # config.password_length = 6..20 + + # Regex to use to validate the email address + # config.email_regexp = /\A([\w\.%\+\-]+)@([\w\-]+\.)+([\w]{2,})\z/i + + # ==> Configuration for :timeoutable + # The time you want to timeout the user session without activity. After this + # time the user will be asked for credentials again. Default is 30 minutes. + # config.timeout_in = 30.minutes + + # ==> Configuration for :lockable + # Defines which strategy will be used to lock an account. + # :failed_attempts = Locks an account after a number of failed attempts to sign in. + # :none = No lock strategy. You should handle locking by yourself. + # config.lock_strategy = :failed_attempts + + # Defines which key will be used when locking and unlocking an account + # config.unlock_keys = [ :email ] + + # Defines which strategy will be used to unlock an account. + # :email = Sends an unlock link to the user email + # :time = Re-enables login after a certain amount of time (see :unlock_in below) + # :both = Enables both strategies + # :none = No unlock strategy. You should handle unlocking by yourself. + # config.unlock_strategy = :both + + # Number of authentication tries before locking an account if lock_strategy + # is failed attempts. + # config.maximum_attempts = 20 + + # Time interval to unlock the account if :time is enabled as unlock_strategy. + # config.unlock_in = 1.hour + + # ==> Configuration for :recoverable + # + # Defines which key will be used when recovering the password for an account + # config.reset_password_keys = [ :email ] + + # ==> Configuration for :encryptable + # Allow you to use another encryption algorithm besides bcrypt (default). You can use + # :sha1, :sha512 or encryptors from others authentication tools as :clearance_sha1, + # :authlogic_sha512 (then you should set stretches above to 20 for default behavior) + # and :restful_authentication_sha1 (then you should set stretches to 10, and copy + # REST_AUTH_SITE_KEY to pepper) + # config.encryptor = :sha512 + + # ==> Configuration for :token_authenticatable + # Defines name of the authentication token params key + # config.token_authentication_key = :auth_token + + # If true, authentication through token does not store user in session and needs + # to be supplied on each request. Useful if you are using the token as API token. + # config.stateless_token = false + + # ==> Scopes configuration + # Turn scoped views on. Before rendering "sessions/new", it will first check for + # "users/sessions/new". It's turned off by default because it's slower if you + # are using only default views. + # config.scoped_views = false + + # Configure the default scope given to Warden. By default it's the first + # devise role declared in your routes (usually :user). + # config.default_scope = :user + + # Configure sign_out behavior. + # Sign_out action can be scoped (i.e. /users/sign_out affects only :user scope). + # The default is true, which means any logout action will sign out all active scopes. + # config.sign_out_all_scopes = true + + # ==> Navigation configuration + # Lists the formats that should be treated as navigational. Formats like + # :html, should redirect to the sign in page when the user does not have + # access, but formats like :xml or :json, should return 401. + # + # If you have any extra navigational formats, like :iphone or :mobile, you + # should add them to the navigational formats lists. + # + # The :"*/*" and "*/*" formats below is required to match Internet + # Explorer requests. + # config.navigational_formats = [:"*/*", "*/*", :html] + + # The default HTTP method used to sign out a resource. Default is :get. + # config.sign_out_via = :get + + # ==> OmniAuth + # Add a new OmniAuth provider. Check the wiki for more information on setting + # up on your models and hooks. + # config.omniauth :github, 'APP_ID', 'APP_SECRET', :scope => 'user,public_repo' + + # ==> Warden configuration + # If you want to use other strategies, that are not supported by Devise, or + # change the failure app, you can configure them inside the config.warden block. + # + # config.warden do |manager| + # manager.failure_app = AnotherApp + # manager.intercept_401 = false + # manager.default_strategies(:scope => :user).unshift :some_external_strategy + # end +end diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml new file mode 100644 index 0000000..e70ad89 --- /dev/null +++ b/config/locales/devise.en.yml @@ -0,0 +1,48 @@ +# Additional translations at http://github.com/plataformatec/devise/wiki/I18n + +en: + errors: + messages: + not_found: "not found" + already_confirmed: "was already confirmed, please try signing in" + not_locked: "was not locked" + not_saved: + one: "1 error prohibited this %{resource} from being saved:" + other: "%{count} errors prohibited this %{resource} from being saved:" + + devise: + failure: + unauthenticated: 'You need to sign in or sign up before continuing.' + unconfirmed: 'You have to confirm your account before continuing.' + locked: 'Your account is locked.' + invalid: 'Invalid email or password.' + invalid_token: 'Invalid authentication token.' + timeout: 'Your session expired, please sign in again to continue.' + inactive: 'Your account was not activated yet.' + sessions: + signed_in: 'Signed in successfully.' + signed_out: 'Signed out successfully.' + passwords: + send_instructions: 'You will receive an email with instructions about how to reset your password in a few minutes.' + updated: 'Your password was changed successfully. You are now signed in.' + confirmations: + send_instructions: 'You will receive an email with instructions about how to confirm your account in a few minutes.' + confirmed: 'Your account was successfully confirmed. You are now signed in.' + registrations: + signed_up: 'Welcome! You have signed up successfully.' + inactive_signed_up: 'You have signed up successfully. However, we could not sign you in because your account is %{reason}.' + updated: 'You updated your account successfully.' + destroyed: 'Bye! Your account was successfully cancelled. We hope to see you again soon.' + unlocks: + send_instructions: 'You will receive an email with instructions about how to unlock your account in a few minutes.' + unlocked: 'Your account was successfully unlocked. You are now signed in.' + omniauth_callbacks: + success: 'Successfully authorized from %{kind} account.' + failure: 'Could not authorize you from %{kind} because "%{reason}".' + mailer: + confirmation_instructions: + subject: 'Confirmation instructions' + reset_password_instructions: + subject: 'Reset password instructions' + unlock_instructions: + subject: 'Unlock Instructions' diff --git a/config/routes.rb b/config/routes.rb index bbb0a1e..ce44e97 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,6 @@ SignalCI::Application.routes.draw do + devise_for :users + resources :projects do resources :builds resources :deploys diff --git a/db/migrate/20110313161720_devise_create_users.rb b/db/migrate/20110313161720_devise_create_users.rb new file mode 100644 index 0000000..3083e74 --- /dev/null +++ b/db/migrate/20110313161720_devise_create_users.rb @@ -0,0 +1,28 @@ +class DeviseCreateUsers < ActiveRecord::Migration + def self.up + create_table(:users) do |t| + t.database_authenticatable :null => false + t.recoverable + t.rememberable + t.trackable + + # t.encryptable + # t.confirmable + # t.lockable :lock_strategy => :failed_attempts, :unlock_strategy => :both + # t.token_authenticatable + + + t.timestamps + end + + add_index :users, :email, :unique => true + add_index :users, :reset_password_token, :unique => true + # add_index :users, :confirmation_token, :unique => true + # add_index :users, :unlock_token, :unique => true + # add_index :users, :authentication_token, :unique => true + end + + def self.down + drop_table :users + end +end diff --git a/db/schema.rb b/db/schema.rb deleted file mode 100644 index da1617c..0000000 --- a/db/schema.rb +++ /dev/null @@ -1,59 +0,0 @@ -# This file is auto-generated from the current state of the database. Instead -# of editing this file, please use the migrations feature of Active Record to -# incrementally modify your database, and then regenerate this schema definition. -# -# Note that this schema.rb definition is the authoritative source for your -# database schema. If you need to create the application database on another -# system, you should be using db:schema:load, not running all the migrations -# from scratch. The latter is a flawed and unsustainable approach (the more migrations -# you'll amass, the slower it'll run and the greater likelihood for issues). -# -# It's strongly recommended to check this file into your version control system. - -ActiveRecord::Schema.define(:version => 20100826174921) do - - create_table "builds", :force => true do |t| - t.integer "project_id" - t.text "output" - t.boolean "success" - t.datetime "created_at" - t.datetime "updated_at" - t.string "author" - t.string "commit" - t.string "comment" - end - - create_table "delayed_jobs", :force => true do |t| - t.integer "priority", :default => 0 - t.integer "attempts", :default => 0 - t.text "handler" - t.text "last_error" - t.datetime "run_at" - t.datetime "locked_at" - t.datetime "failed_at" - t.string "locked_by" - t.datetime "created_at" - t.datetime "updated_at" - end - - create_table "deploys", :force => true do |t| - t.integer "project_id" - t.text "output" - t.boolean "success" - t.datetime "created_at" - t.datetime "updated_at" - end - - create_table "projects", :force => true do |t| - t.string "name" - t.string "url" - t.string "email" - t.datetime "created_at" - t.datetime "updated_at" - t.string "branch", :default => "master" - t.string "deploy_command", :default => "rake inploy:remote:update" - t.string "build_command", :default => "rake build" - t.boolean "building" - end - -end diff --git a/db/seeds.rb b/db/seeds.rb index 664d8c7..3fb3c94 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1,7 +1 @@ -# This file should contain all the record creation needed to seed the database with its default values. -# The data can then be loaded with the rake db:seed (or created alongside the db with db:setup). -# -# Examples: -# -# cities = City.create([{ :name => 'Chicago' }, { :name => 'Copenhagen' }]) -# Mayor.create(:name => 'Daley', :city => cities.first) +User.create! :email => "signal@signal.com", :password => "signal123" diff --git a/features/manage_project.feature b/features/manage_project.feature index 3745902..f5fa6c1 100644 --- a/features/manage_project.feature +++ b/features/manage_project.feature @@ -1,7 +1,9 @@ Feature: Manage projects Scenario: Register new project - Given I am on the new projects page + Given I exist + And I log in + And I am on the new projects page Then I should not see /Building/ When I fill in "project_name" with "Geni" @@ -12,6 +14,8 @@ Feature: Manage projects And I should see /Geni/ Scenario: Update a project + Given I exist + And I log in Given I have a project And I am on the edit project page Then I should not see /Building/ @@ -23,6 +27,8 @@ Feature: Manage projects And I should see /gitFake/ Scenario: Remove a project + Given I exist + And I log in Given I have a project with name "Test Project" And I am on the project page When I follow "remove" @@ -30,6 +36,8 @@ Feature: Manage projects And I should not see "Test Project" Scenario: Build project + Given I exist + And I log in Given I have a project And I am on the project page When I follow "build" @@ -38,6 +46,8 @@ Feature: Manage projects And I should see the name of the project Scenario: Deploy Project + Given I exist + And I log in Given I have a project And I am on the project page When I follow "deploy" diff --git a/features/step_definitions/web_steps.rb b/features/step_definitions/web_steps.rb index 0f0af8a..f6cc014 100644 --- a/features/step_definitions/web_steps.rb +++ b/features/step_definitions/web_steps.rb @@ -217,3 +217,15 @@ def with_scope(locator) Then /^show me the page$/ do save_and_open_page end + +Given /^I exist$/ do + $User = User.create! :email => "signal@signal.com", + :password => "signal123" +end + +Given /^I log in$/ do + visit new_user_session_path + fill_in "user_email", :with => $User.email + fill_in "user_password", :with => $User.password + click_button "Sign in" +end diff --git a/lib/tasks/build.rake b/lib/tasks/build.rake new file mode 100644 index 0000000..a625959 --- /dev/null +++ b/lib/tasks/build.rake @@ -0,0 +1,5 @@ +task :clean do + system "rm rerun.txt" +end + +task :build => ['db:migrate', :spec, :clean, :cucumber, 'metrics:all'] diff --git a/spec/controllers/projects_controller_spec.rb b/spec/controllers/projects_controller_spec.rb index b421f0e..9360ef2 100644 --- a/spec/controllers/projects_controller_spec.rb +++ b/spec/controllers/projects_controller_spec.rb @@ -1,8 +1,11 @@ require 'spec_helper' describe ProjectsController do + include Devise::TestHelpers + context "responding to build" do it "should build a project in the background" do + sign_in @user = Factory(:user) success_on_command project = Factory :project controller.stub!(:resource).and_return(project) diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb new file mode 100644 index 0000000..44032b4 --- /dev/null +++ b/spec/models/user_spec.rb @@ -0,0 +1,5 @@ +require 'spec_helper' + +describe User do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/support/factories/user.rb b/spec/support/factories/user.rb new file mode 100644 index 0000000..f59513f --- /dev/null +++ b/spec/support/factories/user.rb @@ -0,0 +1,4 @@ +Factory.define :user do |f| + f.email "signal@signal.com" + f.password "signal123" +end