git_reflow 0.9.6 → 0.9.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f15edd7ea0d9df95980438cf9e846bd6b3e07829ef05adcc63c7b548c55c623
-  data.tar.gz: f315bc14d8ce7873db9f3e4708da9db581bec1bff63d2302465eb356450a2196
+  metadata.gz: 71b211551532be88db262a0a26ecb4a63072b7090eafbbadff217efe80bb4c3b
+  data.tar.gz: ef3434b6020aa61b9da30b7602f162f9da8ca99ae3da4de32fdc30bcc3f648f1
 SHA512:
-  metadata.gz: bf83e0671b38cd6b3e2f1a008068ad038cee28177ead79a1646994987b0e24141aeb41b0ee191e3856f7f0032df703b66b6a08e41949e319e68ad7dbea9e0bc1
-  data.tar.gz: 948128297b7ba1a38476fb48a81e1f238745a04966295e8506556cf61c1efacc32a98ea8d2966af43ffaa09a536c03790b6b04f129f65bab779ddfd5e9eeb5ed
+  metadata.gz: 1cc0b3e505894ea29a5322014f8459fdc41a74da50098c2f8fffa58039b1d94558538c0d03b824af949a985e34b1cc3a151f84b83b191e6c4df74f321785f82a
+  data.tar.gz: 3737b674eb342c8b8fe0047b637c978b0fdad4d30c228061343f20d9171e9278e0f9356a752f79e0d7d032e7ba969dd5a7f963f654b8e58955ec0eada3673b6a

data/.github/workflows/multi-ruby-tests.yml

@@ -12,7 +12,7 @@ jobs:
       fail-fast: true
       matrix:
         os: [ ubuntu-latest, macos-latest ]
-        ruby: ['2.6.6', '2.7.2', '3.0.0 ']
+        ruby: ['2.6.9', '2.7.5', '3.0.3 ', '3.1.1']
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v2

data/CHANGELOG.md

@@ -1,5 +1,34 @@
 # Changelog
 
+## [v0.9.9](https://github.com/reenhanced/gitreflow/tree/v0.9.9) (2022-03-01)
+
+[Full Changelog](https://github.com/reenhanced/gitreflow/compare/v0.9.7...HEAD)
+
+**Bug fixes:**
+
+- Fixes issue with custom workflows failing to load due to a race condition
+  preventing GitReflow.logger from loading before the rest of the library in
+  Ruby 3.0+
+- Cleans up tests and bump Ruby versions in GH workflows
+
+## [v0.9.8](https://github.com/reenhanced/gitreflow/tree/v0.9.8) (2022-02-20)
+
+[Full Changelog](https://github.com/reenhanced/gitreflow/compare/v0.9.7...HEAD)
+
+**Bug fixes:**
+
+- Fixes a bug accidentally introduced when attempting to debug OptionParser issue.
+
+# Changelog
+
+## [v0.9.7](https://github.com/reenhanced/gitreflow/tree/v0.9.7) (2022-02-20)
+
+[Full Changelog](https://github.com/reenhanced/gitreflow/compare/v0.9.6...HEAD)
+
+**Bug fixes:**
+
+- Correctly parse command line flag and switch values when no help docs are provided
+
 ## [v0.9.6](https://github.com/reenhanced/gitreflow/tree/v0.9.6) (2021-11-05)
 
 [Full Changelog](https://github.com/reenhanced/gitreflow/compare/v0.9.5...HEAD)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    git_reflow (0.9.6)
+    git_reflow (0.9.9)
       bundler (>= 1.10.0)
       codenamev_bitbucket_api (= 0.4.1)
       colorize (>= 0.8.1)
@@ -95,17 +95,17 @@ GEM
       concurrent-ruby (~> 1.0)
     jwt (2.3.0)
     method_source (1.0.0)
-    mini_portile2 (2.6.1)
+    mini_portile2 (2.8.0)
     minitest (5.14.4)
     multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
     nio4r (2.5.7)
-    nokogiri (1.12.5)
-      mini_portile2 (~> 2.6.1)
+    nokogiri (1.13.3)
+      mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    oauth2 (1.4.7)
-      faraday (>= 0.8, < 2.0)
+    oauth2 (1.4.9)
+      faraday (>= 0.17.3, < 3.0)
       jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)

data/lib/git_reflow/git_helpers.rb

@@ -14,6 +14,8 @@ module GitReflow
 
     def git_root_dir
       return @git_root_dir unless @git_root_dir.to_s.empty?
+      return @git_root_dir = Dir.pwd if Dir.exists?("#{Dir.pwd}/.git")
+
       @git_root_dir = run('git rev-parse --show-toplevel', loud: false).strip
     end
 

data/lib/git_reflow/version.rb

@@ -1,3 +1,3 @@
 module GitReflow
-  VERSION = "0.9.6"
+  VERSION = "0.9.9"
 end

data/lib/git_reflow/workflow.rb

@@ -1,3 +1,4 @@
+require 'git_reflow/logger'
 require 'git_reflow/sandbox'
 require 'git_reflow/git_helpers'
 require 'bundler/inline'
@@ -77,8 +78,12 @@ module GitReflow
         GitReflow.git_server
       end
 
-      def logger
-        GitReflow.logger
+      def logger(*args)
+        return @logger if defined?(@logger)
+
+        @logger = GitReflow.try(:logger, *args) || GitReflow::Logger.new(*args)
+      rescue NoMethodError
+        @logger = GitReflow::Logger.new(*args)
       end
 
       # Checks for an installed gem, and if none is installed use bundler's
@@ -113,10 +118,10 @@ module GitReflow
       # @param name [String] the name of the Workflow file to use as a basis
       def use(workflow_name)
         if workflows.key?(workflow_name)
-          GitReflow.logger.debug "Using Workflow: #{workflow_name}"
+          logger.debug "Using Workflow: #{workflow_name}"
           GitReflow::Workflows::Core.load_workflow(workflows[workflow_name])
         else
-          GitReflow.logger.error "Tried to use non-existent Workflow: #{workflow_name}"
+          logger.error "Tried to use non-existent Workflow: #{workflow_name}"
         end
       end
 
@@ -157,6 +162,7 @@ module GitReflow
         self.commands[name] = params
         self.command_docs[name] = params
 
+        logger.debug "adding new command '#{name}' with #{defaults.inspect}"
         self.define_singleton_method(name) do |args = {}|
           args_with_defaults = {}
           args.each do |name, value|
@@ -173,18 +179,18 @@ module GitReflow
             end
           end
 
-          GitReflow.logger.debug "callbacks: #{callbacks.inspect}"
+          logger.debug "callbacks: #{callbacks.inspect}"
           Array(callbacks[:before][name]).each do |block|
-            GitReflow.logger.debug "(before) callback running for `#{name}` command..."
+            logger.debug "(before) callback running for `#{name}` command..."
             argument_overrides = block.call(**args_with_defaults) || {}
             args_with_defaults.merge!(argument_overrides) if argument_overrides.is_a?(Hash)
           end
 
-          GitReflow.logger.info "Running command `#{name}` with args: #{args_with_defaults.inspect}..."
+          logger.info "Running command `#{name}` with args: #{args_with_defaults.inspect}..."
           block.call(**args_with_defaults)
 
           Array(callbacks[:after][name]).each do |block|
-            GitReflow.logger.debug "(after) callback running for `#{name}` command..."
+            logger.debug "(after) callback running for `#{name}` command..."
             block.call(**args_with_defaults)
           end
         end
@@ -202,9 +208,9 @@ module GitReflow
       def before(name, &block)
         name = name.to_sym
         if commands[name].nil?
-          GitReflow.logger.error "Attempted to register (before) callback for non-existing command: #{name}"
+          logger.error "Attempted to register (before) callback for non-existing command: #{name}"
         else
-          GitReflow.logger.debug "(before) callback registered for: #{name}"
+          logger.debug "(before) callback registered for: #{name}"
           callbacks[:before][name] ||= []
           callbacks[:before][name] << block
         end
@@ -222,9 +228,9 @@ module GitReflow
       def after(name, &block)
         name = name.to_sym
         if commands[name].nil?
-          GitReflow.logger.error "Attempted to register (after) callback for non-existing command: #{name}"
+          logger.error "Attempted to register (after) callback for non-existing command: #{name}"
         else
-          GitReflow.logger.debug "(after) callback registered for: #{name}"
+          logger.debug "(after) callback registered for: #{name}"
           callbacks[:after][name] ||= []
           callbacks[:after][name] << block
         end
@@ -310,13 +316,19 @@ module GitReflow
           opts.separator  "COMMAND OPTIONS:" if docs[:flags].any? || docs[:switches].any?
 
           self.commands[name][:flags].each do |flag_name, flag_default|
-            opts.on("-#{flag_name[0]}", "--#{flag_name} #{flag_name.upcase}", command_docs[name][:flags][flag_name]) do |f|
+            # There is a bug in Ruby that will not parse the flag value if no
+            # help text is provided.  Fallback to the flag name.
+            flag_help = command_docs[name][:flags][flag_name] || flag_name
+            opts.on("-#{flag_name[0]}", "--#{flag_name} #{flag_name.upcase}", flag_help) do |f|
               options[kebab_to_underscore(flag_name)] = f || flag_default
             end
           end
 
           self.commands[name][:switches].each do |switch_name, switch_default|
-            opts.on("-#{switch_name[0]}", "--[no-]#{switch_name}", command_docs[name][:switches][switch_name]) do |s|
+            # There is a bug in Ruby that will not parse the switch value if no
+            # help text is provided.  Fallback to the switch name.
+            switch_help = command_docs[name][:switches][switch_name] || switch_name
+            opts.on("-#{switch_name[0]}", "--[no-]#{switch_name}", switch_help) do |s|
               options[kebab_to_underscore(switch_name)] = s || switch_default
             end
           end

data/lib/git_reflow/workflows/core.rb

@@ -13,7 +13,7 @@ module GitReflow
       # @param workflow_path [String] the path of the Workflow file to eval
       def self.load_workflow(workflow_path)
         return unless workflow_path.length > 0 and File.exists?(workflow_path)
-        ::GitReflow.logger.debug "Using workflow: #{workflow_path}"
+        logger.debug "Using workflow: #{workflow_path}"
         self.load_raw_workflow(File.read(workflow_path))
       end
 
@@ -22,7 +22,7 @@ module GitReflow
       # @param workflow_string [String] the contents of a Workflow file to eval
       def self.load_raw_workflow(workflow_string)
         return if workflow_string.strip.empty?
-        ::GitReflow.logger.debug "Evaluating workflow..."
+        logger.debug "Evaluating workflow..."
         binding.eval(workflow_string)
       end
 

data/spec/lib/git_reflow/git_helpers_spec.rb

@@ -30,7 +30,15 @@ describe GitReflow::GitHelpers do
 
   describe ".git_root_dir" do
     subject { Gitacular.git_root_dir }
-    it      { expect { subject }.to have_run_command_silently "git rev-parse --show-toplevel" }
+
+    before { Gitacular.instance_variable_set(:@git_root_dir, nil) }
+
+    it { expect(subject).to eq(Dir.pwd) }
+
+    context "when not in the root directory" do
+      before { allow(Dir).to receive(:pwd).and_return("/tmp/nope") }
+      it { expect { subject }.to have_run_command_silently "git rev-parse --show-toplevel" }
+    end
   end
 
   describe ".git_editor_command" do

data/spec/lib/git_reflow/workflows/core_spec.rb

@@ -34,7 +34,6 @@ describe GitReflow::Workflows::Core do
   end
 
   describe ".load_raw_workflow(workflow_string)" do
-    before { allow(GitReflow::Workflows::Core).to receive(:load_workflow).and_call_original }
     it "evaluates the raw string in the context of the Core workflow" do
       workflow_content = <<~WORKFLOW_CONTENT
         command :dummy do
@@ -44,7 +43,7 @@ describe GitReflow::Workflows::Core do
       fake_binding = instance_double(Binding)
       expect(fake_binding).to receive(:eval).with(workflow_content)
       expect(described_class).to receive(:binding).and_return(fake_binding)
-      GitReflow::Workflows::Core.load_raw_workflow(workflow_content)
+      described_class.load_raw_workflow(workflow_content)
     end
   end
 

data/spec/lib/git_reflow_spec.rb

@@ -41,6 +41,7 @@ describe GitReflow do
       it "calls the defined workflow methods instead of the default core" do
         workflow_path = File.join(File.expand_path("../../fixtures", __FILE__), "/awesome_workflow.rb")
         allow(GitReflow::Config).to receive(:get).with("reflow.workflow").and_return(workflow_path)
+        allow(GitReflow::Workflows::Core).to receive(:load_raw_workflow)
         expect(GitReflow::Workflows::Core).to receive(:load_raw_workflow).with(File.read(workflow_path)).and_call_original
 
         expect{ subject.start }.to have_said "Awesome."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_reflow
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.9
 platform: ruby
 authors:
 - Valentino Stoll
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-11-05 00:00:00.000000000 Z
+date: 2022-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal