geordi 2.10.1 → 2.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e80ce0bcf572c2bcd331b2127371b3969c1b6ac02be617cdb6abb05686e6730
-  data.tar.gz: 270104330ccc177602ce0190508fb8079e166720e91d7c39e75e16cab880db60
+  metadata.gz: c18885f25960a7c8977933c0910c427cb4ca43a462b80ae272610514e7597f0e
+  data.tar.gz: 07a5a7c2cfd084b0e148a3f02fc4a294119ea6e65d2664bde0c8f3da2f37429f
 SHA512:
-  metadata.gz: f40138a830731675086cea816f8f21dfb0db4a4d93456def9077cf74d4297be5503af8698739ba9add26529308805cc560e0bf55d0fa5d9c064dabc42d60a98d
-  data.tar.gz: 8c139434e23cc7ef57a8779f2a3dfab60e3d42991e11c221672b26964003d84e7b3bf41d08332a3992ebf0512e00888584b87355f225e4f5e882d3599cb5665d
+  metadata.gz: 0225535d4bce93d49b6a49cd27d53da4de8814298a835961beacebcc17c972b10c155ae6a66b136b9614725cab551e8a93868cf2c7d26f67570eb86714dca0a3
+  data.tar.gz: 5e0d4bdf3f39f9e5253b25abd515deaac20831b0bc8694eafc2c34a1b961f7ca37a78d7149b7a5711611a7eb886b6996ed24ff4f66b67c1d5ce7e8ffd5c2695e

data/.gitignore

@@ -5,3 +5,4 @@ pkg/*
 .DS_Store
 .pt_project_id
 tmp
+.byebug_history

data/CHANGELOG.md

@@ -5,7 +5,22 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
 
 
 ## Unreleased
+
+### Compatible changes
+
+### Breaking changes
+
+
+## 2.11.0 2020-05-04
+
 ### Compatible changes
+- Added the possibility to change the Rails root for the capistrano config via the environment variable `RAILS_ROOT`. This allows you as a gem developer to run a command like `RAILS_ROOT=~/Projects/my-blog geordi console staging` whereas `geordi` uses the capistrano config from `my-blog`. Otherwise you would need to follow the instructions of [this card](https://makandracards.com/makandra/46617-how-to-use-a-local-gem-in-your-gemfile) to test changes in the gem locally.
+- Bug fix for "no staged changes" even if there are changes present (#83).
+- Fixed deprecation warning for `Thor exit with status 0 on errors` (#84).
+- Replaced `Bundler.with_unbundled_env` with `Bundler.with_original_env` (#77). This is a better replacement than 42cd1c4.
+- Add deprecation warning `Deprecation warning: Ruby 1.8.7 and 1.9.3 support will be dropped in Geordi 3.x.` to Geordi 2.
+- Fix error `thor requires Ruby version >= 2.0.0` for Ruby 1.8.7 and 1.9.3 (https://github.com/makandra/geordi/issues/79#issuecomment-598664191).
+
 ### Breaking changes
 
 

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    geordi (2.10.1)
-      thor (>= 0.18.0)
+    geordi (2.11.0)
+      thor (~> 0.18.0)
 
 GEM
   remote: http://rubygems.org/
@@ -12,55 +12,27 @@ GEM
       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.3)
     childprocess (1.0.1)
       rake (< 13.0)
-    coderay (1.1.2)
-    coercible (1.0.0)
-      descendants_tracker (~> 0.0.1)
     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.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.67.0)
-    faraday (0.17.0)
-      multipart-post (>= 1.2, < 3)
-    faraday_middleware (0.13.1)
-      faraday (>= 0.7.4, < 1.0)
     gherkin (2.12.2)
       multi_json (~> 1.3)
     highline (1.6.21)
-    ice_nine (0.11.2)
     launchy (2.4.3)
       addressable (~> 2.3)
-    method_source (0.9.2)
-    mimemagic (0.3.3)
     multi_json (1.13.1)
     multi_test (0.1.2)
-    multipart-post (2.1.1)
     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)
-    representable (3.0.4)
-      declarative (< 0.1.0)
-      declarative-option (< 0.2.0)
-      uber (< 0.2.0)
     rspec-expectations (3.4.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.4.0)
@@ -68,24 +40,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.4.0)
     rspec-support (3.4.1)
-    thor (1.0.1)
-    thread_safe (0.3.6)
-    tracker_api (1.10.0)
-      addressable
-      equalizer
-      excon
-      faraday
-      faraday_middleware
-      mimemagic
-      multi_json
-      representable
-      virtus
-    uber (0.1.0)
-    virtus (1.0.5)
-      axiom-types (~> 0.1)
-      coercible (~> 1.0)
-      descendants_tracker (~> 0.0, >= 0.0.3)
-      equalizer (~> 0.0, >= 0.0.9)
+    thor (0.18.1)
 
 PLATFORMS
   ruby
@@ -96,9 +51,7 @@ DEPENDENCIES
   highline
   launchy
   parallel_tests
-  pry
   rspec-mocks
-  tracker_api
 
 BUNDLED WITH
    1.17.3

data/README.md

@@ -385,6 +385,9 @@ calling your local geordi like so (adjust paths to your needs):
 
     # @option -I: add directory to load path
     ruby -I ../geordi/lib ../geordi/bin/geordi <command>
+    
+    # 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.

data/geordi.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency 'thor', '>= 0.18.0'
+  s.add_runtime_dependency 'thor', '~> 0.18.0'
 
   s.post_install_message = <<-ATTENTION
 * Binary `geordi` installed

data/lib/geordi/capistrano_config.rb

@@ -53,18 +53,21 @@ module Geordi
     end
 
     def find_project_root!
-      current = Dir.pwd
-      until File.exists?('Capfile')
-        Dir.chdir '..'
-        raise <<-ERROR if current == Dir.pwd
-Could not locate Capfile.
-
-Are you calling me from within a Rails project?
-Maybe Capistrano is not installed in this project.
-        ERROR
-
-        current = Dir.pwd
+      current = ENV['RAILS_ROOT'] || Dir.pwd
+
+      until File.exists?(File.join(current, 'Capfile'))
+        if current == '/' || current == '/home' || !File.directory?(current)
+          raise <<-ERROR
+  Could not locate Capfile.
+
+  Are you calling me from within a Rails project?
+  Maybe Capistrano is not installed in this project.
+          ERROR
+        else
+          current = File.dirname(current)
+        end
       end
+
       current
     end
 

data/lib/geordi/cli.rb

@@ -5,8 +5,17 @@ require 'geordi/util'
 
 module Geordi
   class CLI < Thor
+
+    if Geordi::Util.ruby_version <= Gem::Version.new('2.0.0')
+      warn "Deprecation warning: Ruby 1.8.7 and 1.9.3 support will be dropped in Geordi 3.x."
+    end
+
     include Geordi::Interaction
 
+    def self.exit_on_failure?
+      true
+    end
+
     # load all tasks defined in lib/geordi/commands
     Dir[File.expand_path '../commands/*.rb', __FILE__].each do |file|
       class_eval File.read(file), file

data/lib/geordi/util.rb

@@ -52,7 +52,7 @@ module Geordi
           success = if !defined?(Bundler)
             system(*commands)
           elsif Gem::Version.new(Bundler::VERSION) >= Gem::Version.new('2.1.2')
-            Bundler.with_unbundled_env do
+            Bundler.with_original_env do
               system(*commands)
             end
           else
@@ -94,7 +94,7 @@ module Geordi
           ENV['GEORDI_TESTING_STAGED_CHANGES'] == 'true'
         else
           statuses = `git status --porcelain`.split("\n")
-          statuses.any? { |l| l.start_with? 'A' }
+          statuses.any? { |l| l.start_with? /[A-Z]/i }
         end
       end
 
@@ -161,6 +161,10 @@ module Geordi
         nil
       end
 
+      def ruby_version
+        Gem::Version.new(RUBY_VERSION)
+      end
+
       def file_containing?(file, regex)
         File.exists?(file) and File.read(file).scan(regex).any?
       end

data/lib/geordi/version.rb

@@ -1,3 +1,3 @@
 module Geordi
-  VERSION = '2.10.1'
+  VERSION = '2.11.0'
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: geordi
 version: !ruby/object:Gem::Version
-  version: 2.10.1
+  version: 2.11.0
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-17 00:00:00.000000000 Z
+date: 2020-05-04 00:00:00.000000000 Z
 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:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.18.0
 description: Collection of command line tools we use in our daily work with Ruby,
@@ -156,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Collection of command line tools we use in our daily work with Ruby, Rails