geordi 2.3.0 → 2.4.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 6987f48d4bce3bf0e72d2395052b1147cd0b1f1dc4e3beea5d928e2a187a84e2
+  data.tar.gz: b72fa01a11225dc875a4c124f1d39d111a2bc5d4e4ef6f5a882adc34504335cf
+SHA512:
+  metadata.gz: f04fd539fe8c3d286c28bfdfad3297cf9dcda5edf93eb4719a8bc25a383a04873c4fd2f3a716e65e806546685d8e6af3771d060926a2144fc60c1b68f912a34f
+  data.tar.gz: e3791d7d0d41c610a3b7a6c95a002e354235835948e3b55974dba99254594378f47114f9ffe8c4065ac575f91d6b0acc440c2579dcab0632efc3132037c4c585

data/.ruby-version

@@ -1 +1 @@
-2.6.3
+2.6.5

data/Gemfile

@@ -8,3 +8,4 @@ gem 'rspec-mocks'
 gem 'highline'
 gem 'parallel_tests'
 gem 'launchy'
+gem 'pry'

data/Gemfile.lock

@@ -15,6 +15,7 @@ GEM
     builder (3.2.3)
     childprocess (1.0.1)
       rake (< 13.0)
+    coderay (1.1.2)
     cucumber (1.3.20)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
@@ -27,11 +28,15 @@ GEM
     highline (1.6.21)
     launchy (2.4.3)
       addressable (~> 2.3)
+    method_source (0.9.2)
     multi_json (1.13.1)
     multi_test (0.1.2)
     parallel (0.5.16)
     parallel_tests (0.6.18)
       parallel
+    pry (0.12.2)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
     rake (10.5.0)
     rspec-expectations (3.4.0)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -51,6 +56,7 @@ DEPENDENCIES
   highline
   launchy
   parallel_tests
+  pry
   rspec-mocks
 
 BUNDLED WITH

data/features/deploy.feature

@@ -0,0 +1,43 @@
+Feature: The deploy command
+
+  Scenario: Deploying from master to staging
+
+    Unfortunately, Aruba cannot run commands truly interactively. We need to
+    answer prompts blindly, and check the output afterwards.
+
+    When I run `geordi deploy` interactively
+      # Answer three prompts
+      And I type "staging"
+      And I type "master"
+      And I type ""
+      # Confirm deployment
+      And I type "yes"
+    Then the output should contain:
+      """
+      # Checking whether your master branch is ready
+      > All good.
+
+      # You are about to:
+      > Deploy to staging
+      Go ahead with the deployment? [n]
+      """
+      And the output should contain:
+      """
+      > cap staging deploy:migrations
+      Util.system! cap staging deploy:migrations
+
+      > Deployment complete.
+      """
+
+
+  Scenario: Deploying the current branch
+
+    Deploying the current branch requires support by the deployed application:
+    its deploy config needs to pick up the DEPLOY_BRANCH environment variable.
+
+    When I run `geordi deploy --current-branch` interactively
+      # Answer deployment stage prompt
+      And I type "staging"
+      # Confirm deployment
+      And I type "yes"
+    Then the output should contain "DEPLOY_BRANCH=master cap staging deploy:migrations"

data/features/support/step_definitions/miscellaneous_steps.rb

@@ -0,0 +1,3 @@
+When /^I wait for (\d+) seconds?$/ do |seconds|
+  sleep seconds.to_i
+end

data/lib/geordi/commands/deploy.rb

@@ -28,6 +28,8 @@ LONGDESC
 
 option :no_migrations, :aliases => '-M', :type => :boolean,
   :desc => 'Run cap deploy instead of cap deploy:migrations'
+option :current_branch, :aliases => '-b', :type => :boolean,
+  :desc => 'Set DEPLOY_BRANCH to the current branch during deploy'
 
 def deploy(target_stage = nil)
   # Set/Infer default values
@@ -40,14 +42,19 @@ def deploy(target_stage = nil)
 
   # Ask for required information
   target_stage = prompt 'Deployment stage:', proposed_stage
-  source_branch = prompt 'Source branch:', Util.current_branch
-  target_branch = prompt 'Deploy branch:', branch_stage_map.invert.fetch(target_stage, 'master')
+  if options.current_branch
+    source_branch = target_branch = Util.current_branch
+  else
+    source_branch = prompt 'Source branch:', Util.current_branch
+    target_branch = prompt 'Deploy branch:', branch_stage_map.invert.fetch(target_stage, 'master')
+  end
 
   merge_needed = (source_branch != target_branch)
   push_needed = merge_needed || `git cherry -v | wc -l`.strip.to_i > 0
+  push_needed = false if Util.testing? # Hard to test
 
   announce "Checking whether your #{source_branch} branch is ready"
-  if `git status -s | wc -l`.strip != '0'
+  if `git status -s | wc -l`.strip != '0' and not Util.testing?
     warn "Your #{source_branch} branch holds uncommitted changes."
     prompt('Continue anyway?', 'n', /y|yes/) or fail 'Cancelled.'
   else
@@ -71,6 +78,7 @@ def deploy(target_stage = nil)
     capistrano_call = "cap #{target_stage} deploy"
     capistrano_call << ':migrations' unless Util.gem_major_version('capistrano') == 3 || options.no_migrations
     capistrano_call = "bundle exec #{capistrano_call}" if Util.file_containing?('Gemfile', /capistrano/)
+    capistrano_call = "DEPLOY_BRANCH=#{source_branch} #{capistrano_call}" if options.current_branch
 
     invoke_cmd 'bundle_install'
     invoke_cmd 'yarn_install'

data/lib/geordi/util.rb

@@ -45,7 +45,7 @@ module Geordi
           prompt('Run this now?', 'n', /y|yes/) or fail('Cancelled.')
         end
 
-        if ENV['GEORDI_TESTING']
+        if testing?
           puts "Util.system! #{ commands.join ', ' }"
         else
           # Remove Geordi's Bundler environment when running commands.
@@ -73,7 +73,11 @@ module Geordi
       end
 
       def current_branch
-        `git rev-parse --abbrev-ref HEAD`.strip
+        if testing?
+          'master'
+        else
+          `git rev-parse --abbrev-ref HEAD`.strip
+        end
       end
 
       def deploy_targets
@@ -143,6 +147,10 @@ module Geordi
         File.exists?(file) and File.read(file).scan(regex).any?
       end
 
+      def testing?
+        !!ENV['GEORDI_TESTING']
+      end
+
       private
 
       def bundle_list

data/lib/geordi/version.rb

@@ -1,3 +1,3 @@
 module Geordi
-  VERSION = '2.3.0'
+  VERSION = '2.4.0'
 end

metadata

@@ -1,43 +1,34 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: geordi
-version: !ruby/object:Gem::Version 
-  hash: 3
-  prerelease: 
-  segments: 
-  - 2
-  - 3
-  - 0
-  version: 2.3.0
+version: !ruby/object:Gem::Version
+  version: 2.4.0
 platform: ruby
-authors: 
+authors:
 - Henning Koch
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2019-08-27 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2019-10-21 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: thor
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 87
-        segments: 
-        - 0
-        - 18
-        - 0
+      - !ruby/object:Gem::Version
         version: 0.18.0
   type: :runtime
-  version_requirements: *id001
-description: Collection of command line tools we use in our daily work with Ruby, Rails and Linux at makandra.
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.18.0
+description: Collection of command line tools we use in our daily work with Ruby,
+  Rails and Linux at makandra.
+email:
 - henning.koch@makandra.de
-executables: 
+executables:
 - b
 - cap-all
 - console-for
@@ -57,13 +48,11 @@ executables:
 - shell-for
 - tests
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- .gitignore
-- .ruby-version
-- .travis.yml
+files:
+- ".gitignore"
+- ".ruby-version"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -90,12 +79,14 @@ files:
 - bin/tests
 - features/console.feature
 - features/cucumber.feature
+- features/deploy.feature
 - features/dump.feature
 - features/firefox.feature
 - features/server.feature
 - features/shell.feature
 - features/support/env.rb
 - features/support/step_definitions/aruba_backport_steps.rb
+- features/support/step_definitions/miscellaneous_steps.rb
 - geordi.gemspec
 - lib/geordi.rb
 - lib/geordi/COMMAND_TEMPLATE
@@ -142,41 +133,28 @@ files:
 - lib/geordi/remote.rb
 - lib/geordi/util.rb
 - lib/geordi/version.rb
-has_rdoc: true
 homepage: http://makandra.com
-licenses: 
+licenses:
 - MIT
-post_install_message: |
-  * Binary `geordi` installed
-
+metadata: {}
+post_install_message: "* Binary `geordi` installed\n"
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: geordi
-rubygems_version: 1.6.2
+rubygems_version: 3.0.3
 signing_key: 
-specification_version: 3
-summary: Collection of command line tools we use in our daily work with Ruby, Rails and Linux at makandra.
+specification_version: 4
+summary: Collection of command line tools we use in our daily work with Ruby, Rails
+  and Linux at makandra.
 test_files: []
-