geordi 2.12.3 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5895784a1a8f9b3736ad75362cb39de63e9fd9d6a110c797ae2db1a80afce5fe
-  data.tar.gz: 15479d1cd51aca6abf203687facbfc6636bb67e137b5a31ebb7a28e3d430bda2
+  metadata.gz: bcd8074a50a0c81d4e0b7e2beaef07e8508018a494ae9b3cc288bb29c0b9e796
+  data.tar.gz: a8091353e0d315e6e37f93227688a89d74b7b01abcf4d4a4339271aaaf65e50a
 SHA512:
-  metadata.gz: 6f647a99c2815d66971739927401b527e2c01fcf74dd461fe5941c73b2fd3e68996be2871a9007f76b2dcf54388c377d9838d662e32fc2185e4a976daefbd26a
-  data.tar.gz: 3e041fe4095f22db1071a774024e3d0efda2c5ad15066cfd4fec33b2aa4547230f22194e1ac7af26c9a1977110e03a58c2f6282494812bc076762271572f9a51
+  metadata.gz: b6147e0cbddbcba812f1ea87f03544c0cefd6f40f766b6971275ec5c8efb25f307d47623508bb2990b7cdbd88ed540c51de51920faa59236e5a2034b2cfa9d68
+  data.tar.gz: '078962b0bac78764315e54f2f104354966cc775f18bd9a6d514069c8972bcf3dd4c96cb8b58e0ddf42b233032c12c7d00eb3af24b67970548bb297915d7394b7'

data/.ruby-version

@@ -1 +1 @@
-2.6.5
+2.0.0

data/.travis.yml

@@ -1,8 +1,13 @@
 language: ruby
 
 rvm:
-  - '1.8.7'
-  - '2.6.3'
+  - '2.0.0'
+  - '2.1.10'
+  - '2.2.10'
+  - '2.3.8'
+  - '2.4.10'
+  - '2.5.8'
+  - '2.6.6'
 
 gemfile:
   - 'Gemfile'
@@ -10,6 +15,7 @@ gemfile:
 dist: trusty
 
 install:
+  - gem install bundler:1.17.3
   # 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}

data/CHANGELOG.md

@@ -11,6 +11,14 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
 ### Breaking changes
 
 
+## 3.0.0 2020-05-04
+
+### Compatible changes
+
+### Breaking changes
+- Remove support for Ruby 1.8.7 and Ruby 1.9.3. Bug fixes might still be backported to 2.x, but we will not add any features to 2.x anymore. Please consider to upgrade the Ruby version of your project.
+
+
 ## 2.11.0 2020-05-04
 
 ### Compatible changes

data/Gemfile

@@ -4,13 +4,9 @@ source 'http://rubygems.org'
 gemspec
 
 gem 'aruba'
-gem 'contracts', '=0.9'
 gem 'rspec-mocks'
 gem 'highline'
 gem 'parallel_tests'
 gem 'launchy'
-
-if Gem::Version.new(RUBY_VERSION) > Gem::Version.new('1.8.7')
-  gem 'pry'
-  gem 'tracker_api'
-end
+gem 'pry'
+gem 'tracker_api'

data/Gemfile.lock

@@ -1,48 +1,44 @@
 PATH
   remote: .
   specs:
-    geordi (2.12.3)
-      thor (~> 0.18.0)
+    geordi (3.0.0)
+      thor (~> 1)
 
 GEM
   remote: http://rubygems.org/
   specs:
     addressable (2.3.8)
-    aruba (0.8.1)
-      childprocess (~> 0.5.6)
-      contracts (~> 0.9)
-      cucumber (>= 1.3.19)
-      rspec-expectations (>= 2.99)
+    aruba (0.6.2)
+      childprocess (>= 0.3.6)
+      cucumber (>= 1.1.1)
+      rspec-expectations (>= 2.7.0)
     axiom-types (0.1.1)
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
-    builder (3.2.4)
-    childprocess (0.5.9)
-      ffi (~> 1.0, >= 1.0.11)
-    coderay (1.1.3)
+    builder (3.2.3)
+    childprocess (1.0.1)
+      rake (< 13.0)
+    coderay (1.1.2)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
-    contracts (0.9)
     cucumber (1.3.20)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
       gherkin (~> 2.12)
       multi_json (>= 1.7.5, < 2.0)
       multi_test (>= 0.1.2)
-    declarative (0.0.20)
+    declarative (0.0.10)
     declarative-option (0.1.0)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.2.5)
     equalizer (0.0.11)
-    excon (0.78.0)
-    faraday (1.1.0)
+    excon (0.73.0)
+    faraday (0.17.3)
       multipart-post (>= 1.2, < 3)
-      ruby2_keywords
-    faraday_middleware (1.0.0)
-      faraday (~> 1.0)
-    ffi (1.9.18)
+    faraday_middleware (0.14.0)
+      faraday (>= 0.7.4, < 1.0)
     gherkin (2.12.2)
       multi_json (~> 1.3)
     highline (1.6.21)
@@ -50,8 +46,8 @@ GEM
     launchy (2.4.3)
       addressable (~> 2.3)
     method_source (1.0.0)
-    mimemagic (0.3.5)
-    multi_json (1.15.0)
+    mimemagic (0.3.4)
+    multi_json (1.13.1)
     multi_test (0.1.2)
     multipart-post (2.1.1)
     parallel (0.5.16)
@@ -60,6 +56,7 @@ GEM
     pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
+    rake (10.5.0)
     representable (3.0.4)
       declarative (< 0.1.0)
       declarative-option (< 0.2.0)
@@ -71,10 +68,9 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.4.0)
     rspec-support (3.4.1)
-    ruby2_keywords (0.0.2)
-    thor (0.18.1)
+    thor (1.0.1)
     thread_safe (0.3.6)
-    tracker_api (1.11.0)
+    tracker_api (1.10.0)
       addressable
       equalizer
       excon
@@ -96,7 +92,6 @@ PLATFORMS
 
 DEPENDENCIES
   aruba
-  contracts (= 0.9)
   geordi!
   highline
   launchy

data/README.md

@@ -54,11 +54,6 @@ Commit using a story title from Pivotal Tracker.
 
 Example: `geordi commit`
 
-Any extra arguments are forwarded to `git commit -m <message>`.
-
-If there are no staged changes, prints a warning but will continue to create
-an empty commit.
-
 On the first execution we ask for your Pivotal Tracker API token. It will be
 stored in `~/.gitpt`.
 
@@ -140,23 +135,6 @@ instead of `cap deploy:migrations`. You can force using `deploy` by passing the
 -M option: `geordi deploy -M staging`.
 
 
-### `geordi docker`
-
-Manage docker containers for the current project.
-
-Manage docker containers to run your project dockerized.
-
-It expects a docker-compose file that specifies all services, and a service
-named "main" that opens a shell for the project.
-
-There are two subcommands:
-
-- geordi docker setup
-  Builds all docker containers.
-- geordi docker shell
-  Runs the docker service named 'main'.
-
-
 ### `geordi drop-databases`
 
 Interactively delete local databases.
@@ -400,6 +378,14 @@ browser, as opposed to opening it within the VNC window.
 Contributing
 ============
 
+* Run the tests for the oldest supported ruby version with `bundle exec rake`. Ensure that all other ruby versions in the `travis.yml` pass as well after pushing your feature branch and triggering the travis build.
+* Update this `README`. The whole `geordi` section is auto-generated
+  by `rake readme`.
+* Document your changes in the `CHANGELOG.md` file.
+
+Adding a new command
+---------------
+
 Copy `lib/geordi/COMMAND_TEMPLATE` to `lib/geordi/commands/your_command` and
 edit it to do what you need it to do. Usually, it is hard to automatedly test
 Geordi commands, so make sure you've manually tested it. You can do so by
@@ -410,9 +396,3 @@ calling your local geordi like so (adjust paths to your needs):
     
     # with debugger
     ruby -r byebug -I ../geordi/lib ../geordi/bin/geordi <command>
-
-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 `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/Rakefile

@@ -2,18 +2,14 @@ require 'bundler'
 Bundler::GemHelper.install_tasks
 
 desc 'Default: Run all tests'
-task :default => :features
+task default: :features
 
 task :features do
-  if Gem::Version.new(RUBY_VERSION) > Gem::Version.new('1.8.7')
-    system 'bundle exec cucumber'
-  else
-    system 'bundle exec cucumber --tags "~@ruby>=1.9"'
-  end
+  system 'bundle exec cucumber'
 end
 
 task :readme do
-  require File.expand_path('../lib/geordi/cli', __FILE__)
+  require File.expand_path('lib/geordi/cli', __dir__)
 
   readme = File.read('README.md')
   geordi_section_regex = /
@@ -43,9 +39,9 @@ For details on commands, e.g. supported options, you may always run
 
   Geordi::CLI.all_commands.sort.each do |_, command|
     unless command.hidden?
-      geordi_section << "### `geordi #{ command.usage }`\n\n"
-      geordi_section << "#{ command.description.sub /(\.)?$/, '.' }\n\n"
-      geordi_section << "#{ command.long_description.strip }\n\n" if command.long_description
+      geordi_section << "### `geordi #{command.usage}`\n\n"
+      geordi_section << "#{command.description.sub /(\.)?$/, '.'}\n\n"
+      geordi_section << "#{command.long_description.strip}\n\n" if command.long_description
       geordi_section << "\n"
     end
   end

data/{bin → exe}/geordi

@@ -1,7 +1,5 @@
 #!/usr/bin/env ruby
 
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
-
 require 'geordi/util'
 
 Geordi::Util.installing_missing_gems do

data/geordi.gemspec

@@ -1,28 +1,31 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "geordi/version"
+lib = File.expand_path('lib', __dir__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'geordi/version'
 
-Gem::Specification.new do |s|
-  s.name        = "geordi"
-  s.version     = Geordi::VERSION
-  s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Henning Koch"]
-  s.email       = ["henning.koch@makandra.de"]
-  s.homepage    = "http://makandra.com"
-  s.summary     = 'Collection of command line tools we use in our daily work with Ruby, Rails and Linux at makandra.'
-  s.description = 'Collection of command line tools we use in our daily work with Ruby, Rails and Linux at makandra.'
-  s.license     = 'MIT'
+Gem::Specification.new do |spec|
+  spec.name = 'geordi'
+  spec.version = Geordi::VERSION
+  spec.required_ruby_version = '>= 2.0.0'
+  spec.authors = ['Henning Koch']
+  spec.email = ['henning.koch@makandra.de']
 
-  s.rubyforge_project = "geordi"
+  spec.summary = 'Collection of command line tools we use in our daily work with Ruby, Rails and Linux at makandra.'
+  spec.description = 'Collection of command line tools we use in our daily work with Ruby, Rails and Linux at makandra.'
+  spec.homepage = 'http://makandra.com'
+  spec.license = 'MIT'
 
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  # Specify which files should be added to the gem when it is released.
+  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+  spec.files = Dir.chdir(File.expand_path(__dir__)) do
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  end
+  spec.bindir = 'exe'
+  spec.executables = spec.files.grep(%r(^exe/)) { |f| File.basename(f) }
+  spec.require_paths = ['lib']
 
-  s.add_runtime_dependency 'thor', '~> 0.18.0'
+  spec.add_runtime_dependency 'thor', '~> 1'
 
-  s.post_install_message = <<-ATTENTION
+  spec.post_install_message = <<-ATTENTION
 * Binary `geordi` installed
   ATTENTION
 end

data/lib/geordi/COMMAND_TEMPLATE

@@ -15,12 +15,11 @@ by `rake update_readme`. Thus, please format descriptions in a way that's reader
 friendly both in Markdown and the console.
 LONGDESC
 
-option :opt, :type => :boolean, :aliases => '-o', :banner => 'VALUE_NAME',
-       :desc => 'If set, VALUE_NAME will be used for something'
+option :opt, type: :boolean, aliases: '-o', banner: 'VALUE_NAME', desc: 'If set, VALUE_NAME will be used for something'
 
 def example
   # Invoke other commands like this:
-  invoke_cmd 'other_command', 'argument', :an => 'option'
+  invoke_cmd 'other_command', 'argument', an: 'option'
 
   fail 'Option missing' unless options.opt?
 

data/lib/geordi/capistrano_config.rb

@@ -10,8 +10,8 @@ module Geordi
     end
 
     def user(server)
-      cap2user = deploy_info[ /^\s*set\s*:user,\s*['"](.*?)['"]/, 1 ]
-      cap2user || deploy_info[ /^\s*server\s*['"]#{ server }['"],.*user.{1,4}['"](.*?)['"]/m, 1 ]
+      cap2user = deploy_info[/^\s*set\s*:user,\s*['"](.*?)['"]/, 1]
+      cap2user || deploy_info[/^\s*server\s*['"]#{server}['"],.*user.{1,4}['"](.*?)['"]/m, 1]
     end
 
     def servers
@@ -26,11 +26,11 @@ module Geordi
     end
 
     def remote_root
-      File.join deploy_info[ /^\s*set\s*:deploy_to,\s*['"](.*?)['"]/, 1 ], 'current'
+      File.join deploy_info[/^\s*set\s*:deploy_to,\s*['"](.*?)['"]/, 1], 'current'
     end
 
     def env
-      deploy_info[ /^\s*set\s*:rails_env,\s*['"](.*?)['"]/, 1 ]
+      deploy_info[/^\s*set\s*:rails_env,\s*['"](.*?)['"]/, 1]
     end
 
     def shell
@@ -45,17 +45,17 @@ module Geordi
       self.deploy_info = ''
 
       if stage
-        deploy_info << File.read(File.join root, "config/deploy/#{ stage }.rb")
+        deploy_info << File.read(File.join(root, "config/deploy/#{stage}.rb"))
         deploy_info << "\n"
       end
 
-      deploy_info << File.read(File.join root, 'config/deploy.rb')
+      deploy_info << File.read(File.join(root, 'config/deploy.rb'))
     end
 
     def find_project_root!
       current = ENV['RAILS_ROOT'] || Dir.pwd
 
-      until File.exists?(File.join(current, 'Capfile'))
+      until File.exist?(File.join(current, 'Capfile'))
         if current == '/' || current == '/home' || !File.directory?(current)
           raise <<-ERROR
   Could not locate Capfile.

data/lib/geordi/chromedriver_updater.rb

@@ -27,12 +27,12 @@ module Geordi
 
     def determine_chrome_version
       stdout_str, _error_str, status = Open3.capture3('google-chrome', '--version')
-      chrome_version = if !stdout_str.nil?
+      chrome_version = unless stdout_str.nil?
         stdout_str[/\AGoogle Chrome (\d+)/, 1]
       end
 
       if !status.success? || chrome_version.nil?
-        fail('Could not determine the current Google Chrome version')
+        raise('Could not determine the current Google Chrome version')
       else
         chrome_version.to_i
       end
@@ -42,12 +42,12 @@ module Geordi
       return unless Open3.capture2('which chromedriver')[1].success?
 
       stdout_str, _error_str, status = Open3.capture3('chromedriver', '-v')
-      chromedriver_version = if !stdout_str.nil?
+      chromedriver_version = unless stdout_str.nil?
         stdout_str[/\AChromeDriver (\d+)/, 1]
       end
 
       if !status.success? || chromedriver_version.nil?
-        fail('Could not determine the current chromedriver version')
+        raise('Could not determine the current chromedriver version')
       else
         chromedriver_version.to_i
       end
@@ -69,7 +69,7 @@ module Geordi
 
         file
       else
-        fail("Could not download chromedriver version #{latest_version}")
+        raise("Could not download chromedriver version #{latest_version}")
       end
     end
 
@@ -80,7 +80,7 @@ module Geordi
       if response.is_a?(Net::HTTPSuccess)
         response.body.to_s
       else
-        fail("Could not find the latest version for Google Chrome version #{chrome_version}")
+        raise("Could not find the latest version for Google Chrome version #{chrome_version}")
       end
     end
 
@@ -88,7 +88,7 @@ module Geordi
       _stdout_str, _error_str, status = Open3.capture3('unzip', '-d', output_dir, '-o', zip.path)
 
       unless status.success?
-        fail("Could not unzip #{zip.path}")
+        raise("Could not unzip #{zip.path}")
       end
     end
   end