git_reflow 0.7.2 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 96e1b777d8f08abf43c5dfb292beaf97d4c6e607
-  data.tar.gz: d1675e623c154925a047bbfeb2f7934a485307dc
+  metadata.gz: 64b5781cd74b023d9f5a94c91949cac9528636f7
+  data.tar.gz: f509d8459ca0b092d4bd710722987613bfb6cd5f
 SHA512:
-  metadata.gz: b139ee997dc07485c92fdda0846db9399158ca9cb0025e4fb6c528a9e1af7e6c1ca27b521d245cb0ac0e990ccc9d50fd48e10bfb031913124ba44397641b87ba
-  data.tar.gz: a1baf7332b3c3bf4de2311f435913de66a4b04b9fdedebdb24c9da67e30696b1d667f901ab67f9375f1d63ec4373161c32c07a35ed3a62604e9dfcbcae6300b3
+  metadata.gz: 0ec9acd3327e943147292d1a6f794b23ae5cedbc80250e4c29c3884d26d7382f4b972ef0151ece4ea989e524721248a02ffc2df453c1c1bd094c7f1cd6de62bd
+  data.tar.gz: 860b02e97c65b9121ec31428ee8218a463fe5ccfab846767ee7312891a2321853e053902448bd29111f65200153b0cca775b4432d674465b5d6422239c2c9b02

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    git_reflow (0.7.2)
+    git_reflow (0.7.4)
       colorize (>= 0.7.0)
       github_api (= 0.12.4)
       gli (= 2.13.2)

data/lib/git_reflow/commands/setup.rb

@@ -4,7 +4,16 @@ command :setup do |c|
   c.switch [:l, :local], default_value: false, desc: 'setup GitReflow for the current project only'
   c.switch [:e, :enterprise], default_value: false, desc: 'setup GitReflow with a Github Enterprise account'
   c.action do |global_options, options, args|
-    reflow_options = { project_only: options[:local], enterprise: options[:enterprise] }
+    reflow_options             = { project_only: options[:local], enterprise: options[:enterprise] }
+    existing_git_include_paths = GitReflow::Config.get('include.path', all: true).split("\n")
+
+    unless File.exist?(GitReflow::Config::CONFIG_FILE_PATH) or existing_git_include_paths.include?(GitReflow::Config::CONFIG_FILE_PATH)
+      GitReflow.run "touch #{GitReflow::Config::CONFIG_FILE_PATH}"
+      GitReflow.say "Created #{GitReflow::Config::CONFIG_FILE_PATH} for Reflow specific configurations", :notice
+      GitReflow::Config.add "include.path", GitReflow::Config::CONFIG_FILE_PATH, global: true
+      GitReflow.say "Added #{GitReflow::Config::CONFIG_FILE_PATH} to ~/.gitconfig include paths", :notice
+    end
+
     choose do |menu|
       menu.header = "Available remote Git Server services:"
       menu.prompt = "Which service would you like to use for this project?  "

data/lib/git_reflow/config.rb

@@ -2,6 +2,8 @@ module GitReflow
   module Config
     extend self
 
+    CONFIG_FILE_PATH = "~/.gitconfig.reflow".freeze
+
     def get(key, reload: false, all: false, local: false)
       if reload == false and cached_key_value = instance_variable_get(:"@#{key.tr('.-', '_')}")
         cached_key_value
@@ -21,7 +23,7 @@ module GitReflow
       if local
         GitReflow::Sandbox.run "git config --replace-all #{key} \"#{value}\"", loud: false
       else
-        GitReflow::Sandbox.run "git config --global --replace-all #{key} \"#{value}\"", loud: false
+        GitReflow::Sandbox.run "git config -f #{CONFIG_FILE_PATH} --replace-all #{key} \"#{value}\"", loud: false
       end
     end
 
@@ -30,15 +32,17 @@ module GitReflow
       if local
         GitReflow::Sandbox.run "git config --unset-all #{key} #{value}", loud: false
       else
-        GitReflow::Sandbox.run "git config --global --unset-all #{key} #{value}", loud: false
+        GitReflow::Sandbox.run "git config -f #{CONFIG_FILE_PATH} --unset-all #{key} #{value}", loud: false
       end
     end
 
-    def add(key, value, local: false)
-      if local
+    def add(key, value, local: false, global: false)
+      if global
+        GitReflow::Sandbox.run "git config --global --add #{key} \"#{value}\"", loud: false
+      elsif local
         GitReflow::Sandbox.run "git config --add #{key} \"#{value}\"", loud: false
       else
-        GitReflow::Sandbox.run "git config --global --add #{key} \"#{value}\"", loud: false
+        GitReflow::Sandbox.run "git config -f #{CONFIG_FILE_PATH} --add #{key} \"#{value}\"", loud: false
       end
     end
   end

data/lib/git_reflow/git_helpers.rb

@@ -31,6 +31,11 @@ module GitReflow
       run_command_with_label "git push origin #{current_branch}"
     end
 
+    def update_current_branch
+      run_command_with_label "git pull origin #{current_branch}"
+      push_current_branch
+    end
+
     def fetch_destination(destination_branch)
       run_command_with_label "git fetch origin #{destination_branch}"
     end

data/lib/git_reflow/git_server/git_hub.rb

@@ -100,7 +100,6 @@ module GitReflow
               config.endpoint   = GitServer::GitHub.api_endpoint
               config.site       = GitServer::GitHub.site_url
               config.adapter    = :net_http
-              config.ssl        = {:verify => false}
             end
 
             @connection.connection_options = {headers: {"X-GitHub-OTP" => options[:two_factor_auth_code]}} if options[:two_factor_auth_code]

data/lib/git_reflow/version.rb

@@ -1,3 +1,3 @@
 module GitReflow
-  VERSION = "0.7.2"
+  VERSION = "0.7.4"
 end

data/lib/git_reflow.rb

@@ -109,6 +109,7 @@ module GitReflow
     feature_branch    = current_branch
     base_branch       = options['base'] || 'master'
 
+    update_current_branch
     fetch_destination(base_branch)
     update_destination(feature_branch)
 

data/spec/git_reflow_spec.rb

@@ -194,6 +194,11 @@ describe GitReflow do
 
     subject { GitReflow.deliver inputs }
 
+    it "fetches the latest changes to the current branch" do
+      GitReflow.should_receive(:update_current_branch)
+      subject
+    end
+
     it "fetches the latest changes to the destination branch" do
       GitReflow.should_receive(:fetch_destination).with('master')
       subject

data/spec/lib/git_reflow/config_spec.rb

@@ -16,7 +16,7 @@ describe GitReflow::Config do
     end
 
     context "and checking for updates" do
-      before  { GitReflow::Config.get('checknorris.roundhouse') }
+      before  { GitReflow::Config.get('chucknorris.roundhouse') }
       subject { GitReflow::Config.get('chucknorris.roundhouse') }
       it      { expect{ subject }.to_not have_run_command_silently 'git config --get chucknorris.roundhouse-kick' }
     end
@@ -29,7 +29,7 @@ describe GitReflow::Config do
 
   describe ".set(key)" do
     subject { GitReflow::Config.set('chucknorris.roundhouse', 'to the face') }
-    it      { expect{ subject }.to have_run_command_silently 'git config --global --replace-all chucknorris.roundhouse "to the face"' }
+    it      { expect{ subject }.to have_run_command_silently 'git config -f ~/.gitconfig.reflow --replace-all chucknorris.roundhouse "to the face"' }
 
     context "for current project only" do
       subject { GitReflow::Config.set('chucknorris.roundhouse', 'to the face', local: true) }
@@ -39,11 +39,11 @@ describe GitReflow::Config do
 
   describe ".unset(key)" do
     subject { GitReflow::Config.unset('chucknorris.roundhouse') }
-    it      { expect{ subject }.to have_run_command_silently 'git config --global --unset-all chucknorris.roundhouse ' }
+    it      { expect{ subject }.to have_run_command_silently 'git config -f ~/.gitconfig.reflow --unset-all chucknorris.roundhouse ' }
 
     context "for multi-value keys" do
       subject { GitReflow::Config.unset('chucknorris.roundhouse', value: 'to the face') }
-      it      { expect{ subject }.to have_run_command_silently 'git config --global --unset-all chucknorris.roundhouse "to the face"' }
+      it      { expect{ subject }.to have_run_command_silently 'git config -f ~/.gitconfig.reflow --unset-all chucknorris.roundhouse "to the face"' }
     end
 
     context "for current project only" do
@@ -59,11 +59,16 @@ describe GitReflow::Config do
 
   describe ".add(key)" do
     subject { GitReflow::Config.add('chucknorris.roundhouse', 'to the face') }
-    it      { expect{ subject }.to have_run_command_silently 'git config --global --add chucknorris.roundhouse "to the face"' }
+    it      { expect{ subject }.to have_run_command_silently "git config -f #{GitReflow::Config::CONFIG_FILE_PATH} --add chucknorris.roundhouse \"to the face\"" }
 
     context "for current project only" do
       subject { GitReflow::Config.add('chucknorris.roundhouse', 'to the face', local: true) }
       it      { expect{ subject }.to have_run_command_silently 'git config --add chucknorris.roundhouse "to the face"' }
     end
+
+    context "globally" do
+      subject { GitReflow::Config.add('chucknorris.roundhouse', 'to the face', global: true) }
+      it      { expect{ subject }.to have_run_command_silently 'git config --global --add chucknorris.roundhouse "to the face"' }
+    end
   end
 end

data/spec/lib/git_reflow/git_helpers_spec.rb

@@ -88,6 +88,18 @@ describe GitReflow::GitHelpers do
     end
   end
 
+  describe ".update_current_branch" do
+    subject { Gitacular.update_current_branch }
+    before  { Gitacular.stub(:current_branch).and_return('new-feature') }
+
+    it "updates the remote changes and pushes any local changes" do
+      expect { subject }.to have_run_commands_in_order [
+        "git pull origin new-feature",
+        "git push origin new-feature"
+      ]
+    end
+  end
+
   describe ".merge_feature_branch(options)" do
     let(:destination_branch) { 'monkey-business' }
     let(:feature_branch)     { 'bananas' }

data/spec/lib/git_server/git_hub_spec.rb

@@ -103,10 +103,10 @@ describe GitReflow::GitServer::GitHub do
         end
 
         it "creates git config keys for github connections" do
-          expect{ subject }.to have_run_command_silently "git config --global --replace-all github.site \"#{GitReflow::GitServer::GitHub.site_url}\""
-          expect{ subject }.to have_run_command_silently "git config --global --replace-all github.endpoint \"#{GitReflow::GitServer::GitHub.api_endpoint}\""
-          expect{ subject }.to have_run_command_silently "git config --global --replace-all github.oauth-token \"#{oauth_token_hash[:token]}\""
-          expect{ subject }.to have_run_command_silently "git config --global --replace-all reflow.git-server \"GitHub\""
+          expect{ subject }.to have_run_command_silently "git config -f #{GitReflow::Config::CONFIG_FILE_PATH} --replace-all github.site \"#{GitReflow::GitServer::GitHub.site_url}\""
+          expect{ subject }.to have_run_command_silently "git config -f #{GitReflow::Config::CONFIG_FILE_PATH} --replace-all github.endpoint \"#{GitReflow::GitServer::GitHub.api_endpoint}\""
+          expect{ subject }.to have_run_command_silently "git config -f #{GitReflow::Config::CONFIG_FILE_PATH} --replace-all github.oauth-token \"#{oauth_token_hash[:token]}\""
+          expect{ subject }.to have_run_command_silently "git config -f #{GitReflow::Config::CONFIG_FILE_PATH} --replace-all reflow.git-server \"GitHub\""
         end
 
         context "exclusive to project" do
@@ -118,16 +118,16 @@ describe GitReflow::GitServer::GitHub do
           end
 
           it "creates _local_ git config keys for github connections" do
-            expect{ subject }.to_not have_run_command_silently "git config --global --replace-all github.site \"#{GitReflow::GitServer::GitHub.site_url}\""
-            expect{ subject }.to_not have_run_command_silently "git config --global --replace-all github.endpoint \"#{GitReflow::GitServer::GitHub.api_endpoint}\""
-            expect{ subject }.to_not have_run_command_silently "git config --global --replace-all github.oauth-token \"#{oauth_token_hash[:token]}\""
-            expect{ subject }.to_not have_run_command_silently "git config --global --replace-all reflow.git-server \"GitHub\""
+            expect{ subject }.to_not have_run_command_silently "git config -f #{GitReflow::Config::CONFIG_FILE_PATH} --replace-all github.site \"#{GitReflow::GitServer::GitHub.site_url}\""
+            expect{ subject }.to_not have_run_command_silently "git config -f #{GitReflow::Config::CONFIG_FILE_PATH} --replace-all github.endpoint \"#{GitReflow::GitServer::GitHub.api_endpoint}\""
+            expect{ subject }.to_not have_run_command_silently "git config -f #{GitReflow::Config::CONFIG_FILE_PATH} --replace-all github.oauth-token \"#{oauth_token_hash[:token]}\""
+            expect{ subject }.to_not have_run_command_silently "git config -f #{GitReflow::Config::CONFIG_FILE_PATH} --replace-all reflow.git-server \"GitHub\""
 
             expect{ subject }.to have_run_command_silently "git config --replace-all github.site \"#{GitReflow::GitServer::GitHub.site_url}\""
             expect{ subject }.to have_run_command_silently "git config --replace-all github.endpoint \"#{GitReflow::GitServer::GitHub.api_endpoint}\""
             expect{ subject }.to have_run_command_silently "git config --replace-all github.oauth-token \"#{oauth_token_hash[:token]}\""
             expect{ subject }.to have_run_command_silently "git config --replace-all reflow.git-server \"GitHub\""
-            expect{ subject }.to have_run_command_silently "git config --global --add reflow.local-projects \"#{user}/#{repo}\""
+            expect{ subject }.to have_run_command_silently "git config -f #{GitReflow::Config::CONFIG_FILE_PATH} --add reflow.local-projects \"#{user}/#{repo}\""
           end
         end
 
@@ -135,10 +135,10 @@ describe GitReflow::GitServer::GitHub do
           let(:github) { GitReflow::GitServer::GitHub.new(enterprise: true) }
           before { GitReflow::GitServer::GitHub.stub(:@using_enterprise).and_return(true) }
           it "creates git config keys for github connections" do
-            expect{ subject }.to have_run_command_silently "git config --global --replace-all github.site \"#{enterprise_site}\""
-            expect{ subject }.to have_run_command_silently "git config --global --replace-all github.endpoint \"#{enterprise_api}\""
-            expect{ subject }.to have_run_command_silently "git config --global --replace-all github.oauth-token \"#{oauth_token_hash[:token]}\""
-            expect{ subject }.to have_run_command_silently "git config --global --replace-all reflow.git-server \"GitHub\""
+            expect{ subject }.to have_run_command_silently "git config -f #{GitReflow::Config::CONFIG_FILE_PATH} --replace-all github.site \"#{enterprise_site}\""
+            expect{ subject }.to have_run_command_silently "git config -f #{GitReflow::Config::CONFIG_FILE_PATH} --replace-all github.endpoint \"#{enterprise_api}\""
+            expect{ subject }.to have_run_command_silently "git config -f #{GitReflow::Config::CONFIG_FILE_PATH} --replace-all github.oauth-token \"#{oauth_token_hash[:token]}\""
+            expect{ subject }.to have_run_command_silently "git config -f #{GitReflow::Config::CONFIG_FILE_PATH} --replace-all reflow.git-server \"GitHub\""
           end
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_reflow
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.4
 platform: ruby
 authors:
 - Valentino Stoll
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-22 00:00:00.000000000 Z
+date: 2016-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal