geordi 2.2.0 → 2.3.0

data/.ruby-version

@@ -1 +1 @@
-2.5.1
+2.6.3

data/.travis.yml

@@ -0,0 +1,17 @@
+language: ruby
+
+rvm:
+  - '1.8.7'
+  - '2.6.3'
+
+gemfile:
+  - 'Gemfile'
+
+dist: trusty
+
+install:
+  # Replace default Travis CI bundler script with a version that doesn't
+  # explode when lockfile doesn't match recently bumped version
+  - bundle install --no-deployment --jobs=3 --retry=3 --path=${BUNDLE_PATH:-vendor/bundle}
+
+script: bundle exec rake

data/CHANGELOG.md

@@ -6,6 +6,16 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
 
 ## Unreleased
 
+### Compatible changes
+
+### Breaking changes
+
+## 2.3.0 2019-08-27
+
+### Compatible changes
+- Fixes [#70]: Make "console" and "server" commands ready for Rails 6
+- Added: CI testing with Travis
+
 ## 2.2.0 2019-02-28
 
 ### Compatible changes

data/Gemfile

@@ -5,8 +5,6 @@ gemspec
 
 gem 'aruba'
 gem 'rspec-mocks'
-gem 'pry'
 gem 'highline'
-
-# Required for running features that test parallel test execution
-gem 'parallel_tests' if ENV['GEORDI_TESTING']
+gem 'parallel_tests'
+gem 'launchy'

data/Gemfile.lock

@@ -1,49 +1,38 @@
 PATH
   remote: .
   specs:
-    geordi (2.1.0)
+    geordi (2.3.0)
       thor (>= 0.18.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    aruba (0.13.0)
-      childprocess (~> 0.5.6)
-      contracts (~> 0.9)
-      cucumber (>= 1.3.19)
-      ffi (~> 1.9.10)
-      rspec-expectations (>= 2.99)
-      thor (~> 0.19)
-    builder (3.2.2)
-    childprocess (0.5.9)
-      ffi (~> 1.0, >= 1.0.11)
-    coderay (1.1.0)
-    contracts (0.13.0)
-    cucumber (2.3.2)
+    addressable (2.3.8)
+    aruba (0.6.2)
+      childprocess (>= 0.3.6)
+      cucumber (>= 1.1.1)
+      rspec-expectations (>= 2.7.0)
+    builder (3.2.3)
+    childprocess (1.0.1)
+      rake (< 13.0)
+    cucumber (1.3.20)
       builder (>= 2.1.2)
-      cucumber-core (~> 1.4.0)
-      cucumber-wire (~> 0.0.1)
       diff-lcs (>= 1.1.3)
-      gherkin (~> 3.2.0)
+      gherkin (~> 2.12)
       multi_json (>= 1.7.5, < 2.0)
       multi_test (>= 0.1.2)
-    cucumber-core (1.4.0)
-      gherkin (~> 3.2.0)
-    cucumber-wire (0.0.1)
     diff-lcs (1.2.5)
-    ffi (1.9.10)
-    gherkin (3.2.0)
-    highline (1.7.8)
-    method_source (0.8.2)
-    multi_json (1.11.2)
+    gherkin (2.12.2)
+      multi_json (~> 1.3)
+    highline (1.6.21)
+    launchy (2.4.3)
+      addressable (~> 2.3)
+    multi_json (1.13.1)
     multi_test (0.1.2)
-    parallel (1.12.1)
-    parallel_tests (2.23.0)
+    parallel (0.5.16)
+    parallel_tests (0.6.18)
       parallel
-    pry (0.10.3)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
+    rake (10.5.0)
     rspec-expectations (3.4.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.4.0)
@@ -51,7 +40,6 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.4.0)
     rspec-support (3.4.1)
-    slop (3.6.0)
     thor (0.19.1)
 
 PLATFORMS
@@ -61,9 +49,9 @@ DEPENDENCIES
   aruba
   geordi!
   highline
+  launchy
   parallel_tests
-  pry
   rspec-mocks
 
 BUNDLED WITH
-   1.17.1
+   1.17.3

data/README.md

@@ -1,4 +1,4 @@
-Geordi
+Geordi [![Build Status](https://travis-ci.org/makandra/geordi.svg?branch=master)](https://travis-ci.org/makandra/geordi)
 ======
 
 Geordi is a collection of command line tools we use in our daily work with
@@ -375,10 +375,5 @@ calling your local geordi like so (adjust paths to your needs):
 Don't forget to update this README. The whole `geordi` section is auto-generated
 by `rake readme`. Also remember to add your changes to the CHANGELOG.
 
-Geordi is (partially) tested with Cucumber and Aruba. Run all tests with `rake`.
-Of course you're free to use `geordi tests` ;)
-
-**Note** that Geordi still needs to support Ruby 1.8.7, so make sure you only
-use syntax that was valid back then (e.g. the :old => hash syntax).
-Unfortunately, it is really hard to get Geordi's tests running on 1.8.7, so you
-need to make sure it runs on 1.8.7 manually.
+Geordi is (partially) tested with Cucumber and Aruba. Run `bundle exec rake` to test the gem against you current Ruby
+version. The `travis.yml` contains all Ruby versions the gem is and needs to be tested with.

data/features/console.feature

@@ -4,4 +4,4 @@ Feature: The console command
   Scenario: Opening a local Rails console
     When I run `geordi console`
     Then the output should contain "# Opening a local Rails console"
-      And the output should contain "Util.system! bundle exec rails console development"
+      And the output should contain "Util.system! bundle exec rails console -e development"

data/features/cucumber.feature

@@ -122,7 +122,7 @@ Feature: The cucumber command
 
     When I run `geordi cucumber features/no_solo --verbose`
     Then the output should contain "# Running features"
-      And the output should match /^> .*cucumber .*--tags \"~@solo\"/
+      And the output should match /^> .*features .*--tags \"~@solo\"/
     But the output should not contain "# Running @solo features"
 
 
@@ -157,7 +157,7 @@ Feature: The cucumber command
     """
 
     When I run `geordi cucumber --verbose`
-    Then the output should match /^> PATH=.*24.0:\$PATH.* cucumber/
+    Then the output should match /^> PATH=.*24.0:\$PATH.* features/
 
 
   Scenario: Running all cucumber features matching a given string

data/features/dump.feature

@@ -27,6 +27,8 @@ Feature: The dump command
       And the output should contain "Util.system! ssh, user@www.example.com, -t, cd /var/www/example.com/current && bash --login -c 'dumple staging --for_download'"
       And the output should contain "> Downloading remote dump to tmp/staging.dump"
       # Omitting the absolute path in this regex (.*)
-      And the output should match %r<Util.system! scp -C user@www.example.com:~/dumps/dump_for_download.dump .*/tmp/aruba/tmp/staging.dump>
+      And the output should match:
+      """
+      Util\.system! scp -C user@www\.example\.com:~\/dumps\/dump_for_download.dump .*?\/tmp\/aruba\/tmp\/staging.dump
+      """
       And the output should contain "> Dumped the staging database to tmp/staging.dump"
-

data/features/support/env.rb

@@ -1,8 +1,5 @@
 require 'aruba/cucumber'
 require 'pry'
 
-# require 'geordi'
-# require 'cucumber/rspec/doubles'
-
 # Disables execution of Util.system! calls
 ENV['GEORDI_TESTING'] = 'true'

data/features/support/step_definitions/aruba_backport_steps.rb

@@ -0,0 +1,5 @@
+Given(/^(?:a|the) file(?: named)? "([^"]*)" with "([^"]*)"$/) do |file_name, file_content|
+  unescape_content = file_content.gsub('\n', "\n").gsub('\"', '"').gsub('\e', "\e").gsub('\033', "\e").gsub('\016', "\016").gsub('\017', "\017").gsub('\t', "\t")
+
+  write_file(file_name, unescape_content)
+end

data/lib/geordi/commands/deploy.rb

@@ -69,7 +69,7 @@ def deploy(target_stage = nil)
 
   if prompt('Go ahead with the deployment?', 'n', /y|yes/)
     capistrano_call = "cap #{target_stage} deploy"
-    capistrano_call << ':migrations' unless Util.capistrano3? || options.no_migrations
+    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/)
 
     invoke_cmd 'bundle_install'

data/lib/geordi/commands/security_update.rb

@@ -43,7 +43,7 @@ def security_update(step='prepare')
     Util.system! 'git push', :show_cmd => true
 
     announce 'Deploying all targets'
-    deploy = Util.capistrano3? ? 'deploy' : 'deploy:migrations'
+    deploy = (Util.gem_major_version('capistrano') == 3) ? 'deploy' : 'deploy:migrations'
     invoke_cmd 'capistrano', deploy
 
     success 'Successfully pushed and deployed security update'

data/lib/geordi/cucumber.rb

@@ -80,7 +80,7 @@ module Geordi
       note 'Using parallel_tests'
       self.argv = argv - command_line_features
 
-      type_arg = Gem::Version.new(parallel_tests_version) > Gem::Version.new('0.7.0') ? 'cucumber' : 'features'
+      type_arg = Util.gem_version('parallel_tests') > Gem::Version.new('0.7.0') ? 'cucumber' : 'features'
       features = features_to_run
       features = find_all_features_recursively('features') if features.empty?
 
@@ -93,7 +93,7 @@ module Geordi
     end
 
     def not_tag(name)
-      if cucumber_version < '3'
+      if Util.gem_major_version('cucumber') < 3
         "~#{name}"
       else
         "not #{name}"
@@ -200,35 +200,10 @@ module Geordi
       @spinner_available ||= File.exists?('Gemfile') && File.open('Gemfile').read.scan(/cucumber_spinner/).any?
     end
 
-    def parallel_tests_available?
-      not parallel_tests_version.nil?
-    end
-
-    def parallel_tests_version
-      @parallel_tests_version ||= gem_version('parallel_tests')
-    end
-
-    def cucumber_version
-      @cucumber_version ||= gem_version('cucumber')
-    end
-
-    # Get the version string for the given gem by parsing Gemfile.lock.
-    # Returns nil if the gem is not used.
-    def gem_version(gem)
-      gem_line = bundle_list.split("\n").detect{ |x| x.include?(gem) }
-      if gem_line
-        gem_line.scan( /\(([\d\.]+).*\)/ ).flatten.first
-      end
-    end
-
-    def bundle_list
-      @bundle_list ||= `bundle list`
-    end
-
     def use_parallel_tests?(options)
       options.fetch(:parallel, true) &&
         features_to_run.size != 1 &&
-        parallel_tests_available? &&
+        Util.gem_available?('parallel_tests') &&
         features_to_run.none? { |f| f.include? ':' }
     end
 

data/lib/geordi/util.rb

@@ -55,18 +55,20 @@ module Geordi
       end
 
       def console_command(environment)
-        if File.exists?('script/console')
-          'script/console ' + environment # Rails 2
-        else
+        if gem_major_version('rails') == 2
+          'script/console ' + environment
+        elsif gem_major_version('rails') == 3
           'bundle exec rails console ' + environment
+        else
+          "bundle exec rails console -e #{environment}"
         end
       end
 
       def server_command
-        if File.exists?('script/server')
-          'script/server ""' # Rails 2
+        if gem_major_version('rails') == 2
+          'script/server ""'
         else
-          'bundle exec rails server' # Rails 3+
+          'bundle exec rails server'
         end
       end
 
@@ -112,14 +114,41 @@ module Geordi
         input_string.lines.map(&:chomp).map(&:strip)
       end
 
-      def capistrano3?
-        Util.file_containing? 'Capfile', 'capistrano/setup'
+      def gem_available?(gem)
+        !!gem_version(gem)
+      end
+
+      # Get the major version or for the given gem by parsing the Gemfile.lock.
+      # Returns nil if the gem is not used.
+      def gem_major_version(gem)
+        gem_version = gem_version(gem)
+        gem_version && gem_version.segments[0]
+      end
+
+      # Get the version for the given gem by parsing Gemfile.lock.
+      # Returns nil if the gem is not used.
+      def gem_version(gem)
+        # Lines look like `* will_paginate (2.3.15)` or `railslts-version (2.3.18.16 7f51cc7)`
+        bundle_list.split("\n").each do |line|
+          matches = line.match(/\* #{gem} \(([\d\.]+)/)
+          next if matches.nil? || matches[1].nil?
+
+          return Gem::Version.new(matches[1])
+        end
+
+        nil
       end
 
       def file_containing?(file, regex)
         File.exists?(file) and File.read(file).scan(regex).any?
       end
 
+      private
+
+      def bundle_list
+        @bundle_list ||= `bundle list`
+      end
+
     end
   end
 end

data/lib/geordi/version.rb

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

metadata

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

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA256:
-  metadata.gz: 798b88d15991f16a8c7b78a2a7509f61181f47ecb838f1c4607db8f2686da166
-  data.tar.gz: 7a4d7bf12621ff4c9d13759e80358e5f9f0cb4739ee538b32b7d4e97b3d0e064
-SHA512:
-  metadata.gz: 9efe9b47f6d37bee9d9a97f5e087157be3c59551474c1105ba24f92f5a39928abb46abc3efeed569937263998105193e92b8c2180e226a40ce7581085f104c93
-  data.tar.gz: ceabaa4cf3773c8b7a4c223a30a27a51e79291a16c101a1daac4d188ca658e283f2f7183e3ab1079f3fba517bad845810edd27c67c98cd3fcddc8f6457816164

data/features/launchy_browser.feature

@@ -1,16 +0,0 @@
-Feature: The `launchy_browser` binary
-
-  Scenario: Opening a URL
-    # Add path to Ruby's load path
-    Given I set the environment variable "RUBYLIB" to "test_bin"
-      And a file named "test_bin/launchy.rb" with:
-      """
-      class Launchy
-        def self.open(url)
-          puts "[fake] Launchy.open('#{ url }')"
-        end
-      end
-      """
-
-    When I run `launchy_browser http://www.example.com`
-    Then the output should contain "[fake] Launchy.open('http://www.example.com')"