shipit-engine 0.7.0 → 0.8.0

data/test/models/task_definitions_test.rb

@@ -8,6 +8,11 @@ module Shipit
         'action' => 'Restart application',
         'description' => 'Restart app and job servers',
         'steps' => ['touch tmp/restart'],
+        'allow_concurrency' => true,
+        'variables' => [
+          {'name' => 'FOO', 'title' => 'Set to 0 to foo', 'default' => '1'},
+          {'name' => 'BAR', 'title' => 'Set to 1 to bar', 'default' => '0'},
+        ],
       )
     end
 
@@ -27,6 +32,11 @@ module Shipit
         description: 'Restart app and job servers',
         steps: ['touch tmp/restart'],
         checklist: [],
+        allow_concurrency: true,
+        variables: [
+          {'name' => 'FOO', 'title' => 'Set to 0 to foo', 'default' => '1'},
+          {'name' => 'BAR', 'title' => 'Set to 1 to bar', 'default' => '0'},
+        ],
       }
       assert_equal as_json, TaskDefinition.load(TaskDefinition.dump(@definition)).as_json
     end

data/test/models/team_test.rb

@@ -34,8 +34,14 @@ module Shipit
     end
 
     def george
-      rels = {self: stub(href: 'https://api.github.com/user/george')}
-      stub(id: 42, name: 'George Abitbol', login: 'george', email: 'george@cyclim.se', rels: rels)
+      stub(
+        id: 42,
+        name: 'George Abitbol',
+        login: 'george',
+        email: 'george@cyclim.se',
+        avatar_url: 'https://avatars.githubusercontent.com/u/42?v=3',
+        url: 'https://api.github.com/user/george',
+      )
     end
 
     def new_team

data/test/models/users_test.rb

@@ -4,8 +4,14 @@ module Shipit
   class UsersTest < ActiveSupport::TestCase
     setup do
       @user = shipit_users(:walrus)
-      rels = {self: stub(href: 'https://api.github.com/user/george')}
-      @github_user = stub(id: 42, name: 'George Abitbol', login: 'george', email: 'george@cyclim.se', rels: rels)
+      @github_user = stub(
+        id: 42,
+        name: 'George Abitbol',
+        login: 'george',
+        email: 'george@cyclim.se',
+        avatar_url: 'https://avatars.githubusercontent.com/u/42?v=3',
+        url: 'https://api.github.com/user/george',
+      )
     end
 
     test "find_or_create_from_github persist a new user if he is unknown" do
@@ -75,6 +81,18 @@ module Shipit
       assert_equal 'george@cyclim.se', user.email
     end
 
+    test "#github_api uses the user's access token" do
+      assert_equal @user.github_access_token, @user.github_api.access_token
+    end
+
+    test "#github_api fallbacks to Shipit.github_api if the user doesn't have an access_token" do
+      assert_equal Shipit.github_api, shipit_users(:bob).github_api
+    end
+
+    test "#github_api fallbacks to Shipit.github_api for anonymous users" do
+      assert_equal Shipit.github_api, AnonymousUser.new.github_api
+    end
+
     private
 
     def fetch_user

data/test/unit/deploy_spec_test.rb

@@ -249,6 +249,35 @@ module Shipit
       assert_equal ['bundle exec foo'], definition.steps
     end
 
+    test "task definitions returns an array of VariableDefinition instances" do
+      @spec.expects(:load_config).returns('tasks' =>
+        {'restart' =>
+          {
+            'variables' => [
+              {
+                'name' => 'SAFETY_DISABLED',
+                'title' => 'Set to 1 to do dangerous things',
+                'default' => 0,
+              },
+              {
+                'name' => 'FOO',
+                'title' => 'Set to 0 to foo',
+                'default' => 1,
+              },
+            ],
+            'steps' => %w(foo),
+          },
+        })
+
+      assert_equal 2, @spec.task_definitions.first.variables.size
+      variable_definition = @spec.task_definitions.first.variables.first
+      assert_equal 'SAFETY_DISABLED', variable_definition.name
+    end
+
+    test "task definitions returns an empty array by default" do
+      assert_equal [], @spec.task_definitions
+    end
+
     test "#review_checklist returns an array" do
       @spec.expects(:load_config).returns('review' => {'checklist' => %w(foo bar)})
       assert_equal %w(foo bar), @spec.review_checklist

data/test/unit/environment_variables_test.rb

@@ -0,0 +1,36 @@
+require 'test_helper'
+
+module Shipit
+  class EnvironmentVariablesTest < ActiveSupport::TestCase
+    def setup
+      variable_defs = [
+        {"name" => "FOO", "title" => "Set to 0 to foo", "default" => 1},
+        {"name" => "BAR", "title" => "Set to 1 to bar", "default" => 0},
+      ]
+      @variable_definitions = variable_defs.map(&VariableDefinition.method(:new))
+    end
+    test 'empty env returns empty hash' do
+      empty = {}
+      assert_equal empty, EnvironmentVariables.with(nil).permit(@variable_definitions)
+      assert_equal empty, EnvironmentVariables.with({}).permit(@variable_definitions)
+    end
+
+    test 'correctly sanitizes env variables' do
+      env = {'FOO' => 1, 'BAR' => 1}
+      assert_equal env, EnvironmentVariables.with(env).permit(@variable_definitions)
+    end
+
+    test 'empty permit raises not permitted error' do
+      assert_raises(EnvironmentVariables::NotPermitted) do
+        EnvironmentVariables.with('FOO' => 1).permit({})
+      end
+    end
+
+    test 'throws an exception when a variable is not whitelisted' do
+      env = {'UNSAFE_VARIABLE' => 1}
+      assert_raises(EnvironmentVariables::NotPermitted) do
+        EnvironmentVariables.with(env).permit(@variable_definitions)
+      end
+    end
+  end
+end

data/test/unit/github_url_helper_test.rb

@@ -16,13 +16,5 @@ module Shipit
       expected = 'https://github.com/shopify/shipit-engine/commit/6d9278037b872fd9a6690523e411ecb3aa181355'
       assert_equal expected, github_commit_url(shipit_commits(:first))
     end
-
-    test "#github_diff_url returns a diff url" do
-      from_sha = SecureRandom.hex
-      to_sha = SecureRandom.hex
-      expected = "https://github.com/rails/rails/compare/#{from_sha}...#{to_sha}"
-
-      assert_equal expected, github_diff_url("rails", "rails", from_sha, to_sha)
-    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shipit-engine
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Jean Boussier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-10 00:00:00.000000000 Z
+date: 2016-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: state_machines-activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +150,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.1.0
+- !ruby/object:Gem::Dependency
+  name: attr_encrypted
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: sprockets
   requirement: !ruby/object:Gem::Requirement
@@ -198,28 +212,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.4
+        version: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.4
+        version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: rails-timeago
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.11.1
+        version: 2.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.11.1
+        version: 2.13.0
 - !ruby/object:Gem::Dependency
   name: ansi_stream
   requirement: !ruby/object:Gem::Requirement
@@ -240,14 +254,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.11
+        version: 6.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.11
+        version: 6.3.2
 - !ruby/object:Gem::Dependency
   name: rails_autolink
   requirement: !ruby/object:Gem::Requirement
@@ -268,14 +282,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.1
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.1
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -294,30 +308,30 @@ dependencies:
   name: faraday-http-cache
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.2
 - !ruby/object:Gem::Dependency
   name: redis-objects
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: redis-namespace
   requirement: !ruby/object:Gem::Requirement
@@ -437,6 +451,8 @@ files:
 - app/jobs/shipit/cache_deploy_spec_job.rb
 - app/jobs/shipit/chunk_rollup_job.rb
 - app/jobs/shipit/clear_git_cache_job.rb
+- app/jobs/shipit/continuous_delivery_job.rb
+- app/jobs/shipit/create_on_github_job.rb
 - app/jobs/shipit/deliver_hook_job.rb
 - app/jobs/shipit/destroy_stack_job.rb
 - app/jobs/shipit/emit_event_job.rb
@@ -453,6 +469,8 @@ files:
 - app/models/shipit/api_client.rb
 - app/models/shipit/commit.rb
 - app/models/shipit/commit_checks.rb
+- app/models/shipit/commit_deployment.rb
+- app/models/shipit/commit_deployment_status.rb
 - app/models/shipit/delivery.rb
 - app/models/shipit/deploy.rb
 - app/models/shipit/deploy_spec.rb
@@ -490,6 +508,7 @@ files:
 - app/validators/ascii_only_validator.rb
 - app/validators/subset_validator.rb
 - app/views/layouts/shipit.html.erb
+- app/views/shipit/_variables.html.erb
 - app/views/shipit/commits/_commit.html.erb
 - app/views/shipit/commits/_commit_author.html.erb
 - app/views/shipit/deploys/_checklist.html.erb
@@ -532,6 +551,10 @@ files:
 - db/migrate/20160104151742_increase_tasks_type_size_back.rb
 - db/migrate/20160104151833_convert_sti_columns.rb
 - db/migrate/20160122165559_rename_hooks_url_in_delivery_url.rb
+- db/migrate/20160210183823_add_allow_concurrency_to_tasks.rb
+- db/migrate/20160303163611_create_shipit_commit_deployments.rb
+- db/migrate/20160303170913_create_shipit_commit_deployment_statuses.rb
+- db/migrate/20160303203940_add_encrypted_token_to_users.rb
 - db/schema.rb
 - lib/shipit-engine.rb
 - lib/shipit.rb
@@ -540,6 +563,7 @@ files:
 - lib/shipit/csv_serializer.rb
 - lib/shipit/deploy_commands.rb
 - lib/shipit/engine.rb
+- lib/shipit/environment_variables.rb
 - lib/shipit/first_parent_commits_iterator.rb
 - lib/shipit/null_serializer.rb
 - lib/shipit/octokit_iterator.rb
@@ -608,6 +632,17 @@ files:
 - test/dummy/config/routes.rb
 - test/dummy/config/secrets.example.yml
 - test/dummy/config/secrets.yml
+- test/dummy/data/stacks/byroot/junk/production/git/bar.txt
+- test/dummy/data/stacks/byroot/junk/production/git/dkfdsf
+- test/dummy/data/stacks/byroot/junk/production/git/dskjfsd
+- test/dummy/data/stacks/byroot/junk/production/git/dslkjfjsdf
+- test/dummy/data/stacks/byroot/junk/production/git/plopfizz
+- test/dummy/data/stacks/byroot/junk/production/git/sd
+- test/dummy/data/stacks/byroot/junk/production/git/sdkfjsdf
+- test/dummy/data/stacks/byroot/junk/production/git/sdlfjsdfdsfj
+- test/dummy/data/stacks/byroot/junk/production/git/sdlkfjsdlkfjsdlkfjdsfsdfksdfjsldkfjsdlkfjsdf
+- test/dummy/data/stacks/byroot/junk/production/git/shipit.yml
+- test/dummy/data/stacks/byroot/junk/production/git/toto.txt
 - test/dummy/db/development.sqlite3
 - test/dummy/db/schema.rb
 - test/dummy/db/seeds.rb
@@ -620,6 +655,8 @@ files:
 - test/fixtures/payloads/push_not_master.json
 - test/fixtures/payloads/status_master.json
 - test/fixtures/shipit/api_clients.yml
+- test/fixtures/shipit/commit_deployment_statuses.yml
+- test/fixtures/shipit/commit_deployments.yml
 - test/fixtures/shipit/commits.yml
 - test/fixtures/shipit/deliveries.yml
 - test/fixtures/shipit/github_hooks.yml
@@ -652,6 +689,8 @@ files:
 - test/jobs/unique_job_test.rb
 - test/models/api_client_test.rb
 - test/models/commit_checks_test.rb
+- test/models/commit_deployment_status_test.rb
+- test/models/commit_deployment_test.rb
 - test/models/commits_test.rb
 - test/models/delivery_test.rb
 - test/models/deploys_test.rb
@@ -673,6 +712,7 @@ files:
 - test/unit/csv_serializer_test.rb
 - test/unit/deploy_commands_test.rb
 - test/unit/deploy_spec_test.rb
+- test/unit/environment_variables_test.rb
 - test/unit/github_url_helper_test.rb
 - test/unit/shipit_test.rb
 - vendor/assets/javascripts/jquery-notify.js
@@ -747,6 +787,17 @@ test_files:
 - test/dummy/config/secrets.example.yml
 - test/dummy/config/secrets.yml
 - test/dummy/config.ru
+- test/dummy/data/stacks/byroot/junk/production/git/bar.txt
+- test/dummy/data/stacks/byroot/junk/production/git/dkfdsf
+- test/dummy/data/stacks/byroot/junk/production/git/dskjfsd
+- test/dummy/data/stacks/byroot/junk/production/git/dslkjfjsdf
+- test/dummy/data/stacks/byroot/junk/production/git/plopfizz
+- test/dummy/data/stacks/byroot/junk/production/git/sd
+- test/dummy/data/stacks/byroot/junk/production/git/sdkfjsdf
+- test/dummy/data/stacks/byroot/junk/production/git/sdlfjsdfdsfj
+- test/dummy/data/stacks/byroot/junk/production/git/sdlkfjsdlkfjsdlkfjdsfsdfksdfjsldkfjsdlkfjsdf
+- test/dummy/data/stacks/byroot/junk/production/git/shipit.yml
+- test/dummy/data/stacks/byroot/junk/production/git/toto.txt
 - test/dummy/db/development.sqlite3
 - test/dummy/db/schema.rb
 - test/dummy/db/seeds.rb
@@ -761,6 +812,8 @@ test_files:
 - test/fixtures/payloads/push_not_master.json
 - test/fixtures/payloads/status_master.json
 - test/fixtures/shipit/api_clients.yml
+- test/fixtures/shipit/commit_deployment_statuses.yml
+- test/fixtures/shipit/commit_deployments.yml
 - test/fixtures/shipit/commits.yml
 - test/fixtures/shipit/deliveries.yml
 - test/fixtures/shipit/github_hooks.yml
@@ -793,6 +846,8 @@ test_files:
 - test/jobs/unique_job_test.rb
 - test/models/api_client_test.rb
 - test/models/commit_checks_test.rb
+- test/models/commit_deployment_status_test.rb
+- test/models/commit_deployment_test.rb
 - test/models/commits_test.rb
 - test/models/delivery_test.rb
 - test/models/deploys_test.rb
@@ -814,5 +869,6 @@ test_files:
 - test/unit/csv_serializer_test.rb
 - test/unit/deploy_commands_test.rb
 - test/unit/deploy_spec_test.rb
+- test/unit/environment_variables_test.rb
 - test/unit/github_url_helper_test.rb
 - test/unit/shipit_test.rb