git_reflow 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39852c57b3be6a203026afbf22cd14049d954674cceb146b54ab8ab2704d3717
-  data.tar.gz: 1ed1b701de39c181c6ad5b791f48991c4a234caf721ddead4066866dc8d1e5f2
+  metadata.gz: 824f8b64c6d06856254f319565137a75873f33fa4020714ea873d343dc33a5e3
+  data.tar.gz: 7dd4f713c777d88bc6f36f472737aeeeeb8110efed81686b6f1bdb7c2de84e75
 SHA512:
-  metadata.gz: bef6f0639dc9f9ab50b5977556ff48bb988fad2a92799f8ceba6adc6c0c8e156fc18885f16b433def991afddb59e760d12769c0c360cb2ada92c3a653f4f60df
-  data.tar.gz: 38b2cb929a52092a933ed3c7d684f43146dca83e879700a0e796079868eab6bfaad7ec2e015fecb898e9b95a5d7e818bb50320a8f1273f0ef09d30f91c19d134
+  metadata.gz: 44c6a6508e52f95e8446c0cabd2bbecf93a1dff91172100e16d8f7920e02664ee8611781df0cdec03bc3df590023e4620946940790413e0e912d61436860a47a
+  data.tar.gz: d6b5164ce0ade6a15295f723f098b5ddc53278cc6db9118795357150b4baee00c49bc18843c680c7d863902566e1b6217de462d78284ed88dc17b367dcc25643

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    git_reflow (0.9.0)
+    git_reflow (0.9.1)
+      bundler (>= 1.10.0)
       colorize (>= 0.7.0)
       github_api (= 0.18.2)
       highline
@@ -11,12 +12,13 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.4.0)
+    addressable (2.6.0)
+      public_suffix (>= 2.0.2, < 4.0)
     appraisal (2.2.0)
       bundler
       rake
       thor (>= 0.14.0)
-    byebug (10.0.2)
+    byebug (11.0.1)
     chronic (0.10.2)
     coderay (1.1.2)
     colorize (0.8.1)
@@ -35,33 +37,34 @@ GEM
       faraday (~> 0.8)
       hashie (~> 3.5, >= 3.5.2)
       oauth2 (~> 1.0)
-    hashdiff (0.3.7)
+    hashdiff (0.3.8)
     hashie (3.6.0)
-    highline (2.0.0)
+    highline (2.0.2)
     httpclient (2.8.3)
     jwt (2.1.0)
-    method_source (0.9.0)
-    mini_portile2 (2.3.0)
+    method_source (0.9.2)
+    mini_portile2 (2.4.0)
     multi_json (1.13.1)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
-    nokogiri (1.8.5)
-      mini_portile2 (~> 2.3.0)
+    nokogiri (1.10.2)
+      mini_portile2 (~> 2.4.0)
     oauth2 (1.4.1)
       faraday (>= 0.8, < 0.16.0)
       jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    pry (0.11.3)
+    pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    pry-byebug (3.6.0)
-      byebug (~> 10.0)
+    pry-byebug (3.7.0)
+      byebug (~> 11.0)
       pry (~> 0.10)
-    rack (2.0.6)
-    rake (12.3.1)
-    rdoc (6.0.3)
+    public_suffix (3.0.3)
+    rack (2.0.7)
+    rake (12.3.2)
+    rdoc (6.1.1)
     reenhanced_bitbucket_api (0.3.2)
       faraday (~> 0.9.0)
       faraday_middleware (~> 0.9.0)
@@ -82,11 +85,11 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.7.0)
     rspec-support (3.7.1)
-    safe_yaml (1.0.4)
+    safe_yaml (1.0.5)
     simple_oauth (0.3.1)
-    thor (0.20.0)
+    thor (0.20.3)
     thread_safe (0.3.6)
-    webmock (3.3.0)
+    webmock (3.5.1)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
@@ -97,7 +100,6 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal (= 2.2.0)
-  bundler (~> 1.16)
   chronic
   git_reflow!
   pry-byebug

data/Workflow

@@ -0,0 +1,3 @@
+# This file is empty on purpose in case there are any custom workflows configured locally.
+# Eventually we will update it to:
+# use "OpenSourceWorkflow"

data/git_reflow.gemspec

@@ -19,7 +19,6 @@ Gem::Specification.new do |s|
   s.rdoc_options     << '--title' << 'git_reflow' << '-ri'
 
   s.add_development_dependency('appraisal', '2.2.0')
-  s.add_development_dependency('bundler', "~> 1.16")
   s.add_development_dependency('chronic')
   s.add_development_dependency('pry-byebug')
   s.add_development_dependency('rake', "~> 12.3")
@@ -28,6 +27,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency('webmock')
   s.add_development_dependency('wwtd', '1.3.0')
 
+  s.add_dependency('bundler', '>= 1.10.0')
   s.add_dependency('colorize', '>= 0.7.0')
   s.add_dependency('highline')
   s.add_dependency('httpclient')

data/lib/git_reflow/rspec/command_line_helpers.rb

@@ -7,6 +7,7 @@ module GitReflow
       def stub_command_line
         $commands_ran     = []
         $stubbed_commands = {}
+        $stubbed_runners  = Set.new
         $output           = []
         $says             = []
 
@@ -33,6 +34,7 @@ module GitReflow
       end
 
       def stub_run_for(module_to_stub)
+        $stubbed_runners << module_to_stub
         allow(module_to_stub).to receive(:run) do |command, options|
           options = { loud: true, blocking: true }.merge(options || {})
           $commands_ran << Hashie::Mash.new(command: command, options: options)
@@ -52,24 +54,31 @@ module GitReflow
         $says = []
       end
 
-      def stub_command(command, return_value)
+      def stub_command(command:, return_value: "", options: {})
         $stubbed_commands[command] = return_value
-        allow(GitReflow::Sandbox).to receive(:run).with(command).and_return(return_value)
+        $stubbed_runners.each do |runner|
+          allow(runner).to receive(:run).with(command, options) do |command, options|
+            options = { loud: true, blocking: true }.merge(options || {})
+            $commands_ran << Hashie::Mash.new(command: command, options: options)
+            $stubbed_commands[command] = return_value
+            raise GitReflow::Sandbox::CommandError.new(return_value, "\"#{command}\" failed to run.") if options[:raise]
+          end
+        end
       end
 
       def stub_command_line_inputs_for(module_to_stub, inputs)
         allow(module_to_stub).to receive(:ask) do |terminal, question|
-        return_value = inputs[question]
-        question = ""
-        return_value
+          return_value = inputs[question]
+          question = ""
+          return_value
         end
       end
 
       def stub_command_line_inputs(inputs)
         allow_any_instance_of(HighLine).to receive(:ask) do |terminal, question|
-        return_value = inputs[question]
-        question = ""
-        return_value
+          return_value = inputs[question]
+          question = ""
+          return_value
         end
       end
 

data/lib/git_reflow/sandbox.rb

@@ -12,8 +12,16 @@ module GitReflow
       plain:          :white
     }
 
+    class CommandError < StandardError;
+      attr_reader :output
+      def initialize(output, *args)
+        @output = output
+        super(*args)
+      end
+    end
+
     def run(command, options = {})
-      options = { loud: true, blocking: true }.merge(options)
+      options = { loud: true, blocking: true, raise: false }.merge(options)
 
       GitReflow.logger.debug "Running... #{command}"
 
@@ -22,12 +30,13 @@ module GitReflow
       else
         output = %x{#{command}}
 
-        if options[:blocking] == true && !$?.success?
-          abort "\"#{command}\" failed to run."
-        else
-          puts output if options[:loud] == true
-          output
+        if !$?.success?
+          raise CommandError.new(output, "\"#{command}\" failed to run.") if options[:raise] == true
+          abort "\"#{command}\" failed to run." if options[:blocking] == true
         end
+
+        puts output if options[:loud] == true
+        output
       end
     end
 

data/lib/git_reflow/version.rb

@@ -1,3 +1,3 @@
 module GitReflow
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end

data/lib/git_reflow/workflow.rb

@@ -1,5 +1,6 @@
 require 'git_reflow/sandbox'
 require 'git_reflow/git_helpers'
+require 'bundler/inline'
 
 module GitReflow
   module Workflow
@@ -80,6 +81,32 @@ module GitReflow
         GitReflow.logger
       end
 
+      # Checks for an installed gem, and if none is installed use bundler's
+      # inline gemfile to install it.
+      #
+      # @param name [String] the name of the gem to require as a dependency
+      def use_gem(name, *args)
+        run("gem list -ie #{name}", loud: false, raise: true)
+        logger.info "Using installed gem '#{name}' with options: #{args.inspect}"
+      rescue ::GitReflow::Sandbox::CommandError => e
+        abort e.message unless e.output =~ /\Afalse/
+        logger.info "Installing gem '#{name}' with options: #{args.inspect}"
+        say "Installing gem '#{name}'...", :notice
+        gemfile do
+          source "https://rubygems.org"
+          gem name, *args
+        end
+      end
+
+      # Use bundler's inline gemfile to install dependencies.
+      # See: https://bundler.io/v1.16/guides/bundler_in_a_single_file_ruby_script.html
+      #
+      # @yield A block to be executed in the context of Bundler's `gemfile` DSL
+      def use_gemfile(&block)
+        logger.info "Using a custom gemfile"
+        gemfile(true, &block)
+      end
+
       # Loads a pre-defined workflow (FlatMergeWorkflow) from within another
       # Workflow file
       #
@@ -153,7 +180,7 @@ module GitReflow
             args_with_defaults.merge!(argument_overrides) if argument_overrides.is_a?(Hash)
           end
 
-          GitReflow.logger.debug "Running command `#{name}` with args: #{args_with_defaults.inspect}..."
+          GitReflow.logger.info "Running command `#{name}` with args: #{args_with_defaults.inspect}..."
           block.call(**args_with_defaults)
 
           Array(callbacks[:after][name]).each do |block|

data/spec/lib/git_reflow/workflow_spec.rb

@@ -6,6 +6,23 @@ describe GitReflow::Workflow do
     include GitReflow::Workflow
   end
 
+  class DummyBundler
+    def gemfile(&block)
+      instance_eval &block
+    end
+
+    def source(name); end
+    def gem(name, *args); end
+  end
+
+  class DummyGemifiedWorkflow
+    include GitReflow::Workflow
+
+    command :whirl do
+      puts "whirl"
+    end
+  end
+
   let(:workflow) { DummyWorkflow }
   let(:loader)   { double() }
 
@@ -164,9 +181,6 @@ describe GitReflow::Workflow do
 
   describe ".command" do
     it "creates a class method for a bogus command" do
-      class DummyWorkflow
-        include GitReflow::Workflow
-      end
       workflow.command :bogus do
         GitReflow.say "Woohoo"
       end
@@ -235,4 +249,56 @@ describe GitReflow::Workflow do
     end
   end
 
+  describe ".use_gem(name, *ags)" do
+    let(:mock_bundler) { DummyBundler.new }
+
+    before do
+      allow(DummyGemifiedWorkflow).to receive(:gemfile) do |&block|
+        mock_bundler.gemfile(&block)
+      end
+      stub_run_for(DummyGemifiedWorkflow)
+    end
+
+    it "Installs a gem using Bundler's inline gemfile" do
+      stub_command(command: "gem list -ie whirly", options: { loud: false, raise: true }, return_value: "false")
+      expect(mock_bundler).to receive(:source).with("https://rubygems.org")
+      expect(mock_bundler).to receive(:gem).with("whirly", "0.2.6")
+
+      DummyGemifiedWorkflow.class_eval do
+        use_gem "whirly", "0.2.6"
+      end
+    end
+
+    it "Uses an existing gem if it's already installed" do
+      stub_command(command: "gem list -ie whirly", options: { loud: false, raise: false }, return_value: "true")
+      expect(DummyGemifiedWorkflow).to_not receive(:gemfile)
+
+      DummyGemifiedWorkflow.class_eval do
+        use_gem "whirly", "0.2.6"
+      end
+    end
+  end
+
+  describe ".use_gemfile(&block)" do
+    let(:mock_bundler) { DummyBundler.new }
+
+    before do
+      allow(DummyGemifiedWorkflow).to receive(:gemfile) do |&block|
+        mock_bundler.gemfile(&block)
+      end
+      stub_run_for(DummyGemifiedWorkflow)
+    end
+
+    it "runs bundler's inline gemfile with the provided block" do
+      expect(mock_bundler).to receive(:source).with("https://rubygems.org")
+      expect(mock_bundler).to receive(:gem).with("standard")
+
+      DummyGemifiedWorkflow.class_eval do
+        use_gemfile do
+          source "https://rubygems.org"
+          gem "standard"
+        end
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_reflow
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Valentino Stoll
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-09 00:00:00.000000000 Z
+date: 2019-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal
@@ -26,20 +26,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.2.0
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.16'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.16'
 - !ruby/object:Gem::Dependency
   name: chronic
   requirement: !ruby/object:Gem::Requirement
@@ -138,6 +124,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.3.0
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.10.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.10.0
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -226,6 +226,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- Workflow
 - _config.yml
 - bin/console
 - bin/setup