git-process 1.0.4 → 1.0.5

data/lib/git-process/github_client.rb

@@ -8,7 +8,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.require 'shellwords'
+# limitations under the License.
 
 require 'octokit'
 
@@ -23,19 +23,16 @@ module Octokit
     def connection(authenticate=true, raw=false, version=3, force_urlencoded=false)
       if site
         url = site
+      elsif version == 2
+        url = "https://github.com"
       else
-        case version
-        when 2
-          url = "https://github.com"
-        when 3
-          url = "https://api.github.com"
-        end
+        url = "https://api.github.com"
       end
 
       options = {
-        :proxy => proxy,
-        :ssl => { :verify => false },
-        :url => url,
+          :proxy => proxy,
+          :ssl => {:verify => false},
+          :url => url,
       }
 
       options.merge!(:params => {:access_token => oauth_token}) if oauthed? && !authenticated?
@@ -75,6 +72,7 @@ class GitHubClient < Octokit::Client
 
   alias :old_request :request
 
+
   def request(method, path, options, version, authenticate, raw, force_urlencoded)
     if /api.github.com/ !~ site
       path = "/api/v3/#{path}"

data/lib/git-process/github_pull_request.rb

@@ -8,7 +8,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.require 'shellwords'
+# limitations under the License.
 
 require 'git-process/github_service'
 require 'octokit'
@@ -22,6 +22,7 @@ module GitHub
 
     attr_reader :lib, :repo
 
+
     def initialize(lib, repo, opts = {})
       @lib = lib
       @repo = repo
@@ -39,8 +40,8 @@ module GitHub
       logger.info { "Creating a pull request asking for '#{head}' to be merged into '#{base}' on #{repo}." }
       begin
         client.create_pull_request(repo, base, head, title, body)
-      rescue Octokit::UnprocessableEntity => exp
-        pull = pull_requests.find {|p| p[:head][:ref] == head and p[:base][:ref] == base}
+      rescue Octokit::UnprocessableEntity
+        pull = pull_requests.find { |p| p[:head][:ref] == head and p[:base][:ref] == base }
         logger.warn { "Pull request already exists. See #{pull[:html_url]}" }
         pull
       end
@@ -49,7 +50,7 @@ module GitHub
 
     def find_pull_request(base, head)
       json = pull_requests
-      json.find {|p| p[:head][:ref] == head and p[:base][:ref] == base}
+      json.find { |p| p[:head][:ref] == head and p[:base][:ref] == base }
     end
 
 
@@ -62,7 +63,7 @@ module GitHub
         logger.info { "Closing a pull request asking for '#{head}' to be merged into '#{base}' on #{repo}." }
 
         json = pull_requests
-        pull = json.find {|p| p[:head][:ref] == head and p[:base][:ref] == base}
+        pull = json.find { |p| p[:head][:ref] == head and p[:base][:ref] == base }
 
         raise NotFoundError.new(base, head, repo, json) if pull.nil?
 
@@ -72,13 +73,14 @@ module GitHub
         logger.info { "Closing a pull request \##{pull_number} on #{repo}." }
       end
 
-      client.patch("repos/#{Octokit::Repository.new(repo)}/pulls/#{pull_number}", {:state  => 'closed'})
+      client.patch("repos/#{Octokit::Repository.new(repo)}/pulls/#{pull_number}", {:state => 'closed'})
     end
 
 
     class NotFoundError < StandardError
       attr_reader :base, :head, :repo
 
+
       def initialize(base, head, repo, pull_requests_json)
         @base = base
         @head = head
@@ -90,7 +92,7 @@ module GitHub
 
         msg = "Could not find a pull request for '#{head}' to be merged with '#{base}' on #{repo}."
         msg += "\n\nExisting Pull Requests:"
-        msg = pull_requests.inject(msg) {|a,v| "#{a}\n  #{v[:head]} -> #{v[:base]}" }
+        msg = pull_requests.inject(msg) { |a, v| "#{a}\n  #{v[:head]} -> #{v[:base]}" }
 
         super(msg)
       end

data/lib/git-process/github_service.rb

@@ -8,7 +8,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.require 'shellwords'
+# limitations under the License.
 
 require 'highline/import'
 require 'git-process/github_client'
@@ -21,7 +21,7 @@ module GitHubService
     if @client.nil?
       auth_token
       logger.debug { "Creating GitHub client for user #{user} using token '#{auth_token}'" }
-      @client = GitHubClient.new(:login => user, :oauth_token=> auth_token)
+      @client = GitHubClient.new(:login => user, :oauth_token => auth_token)
       @client.site = site
     end
     @client
@@ -38,8 +38,8 @@ module GitHubService
 
     raise GitHubService::NoRemoteRepository.new("There is no value set for 'remote.origin.url'") if origin_url.empty?
 
-    if /^git\@/ =~ origin_url
-      host = origin_url.sub(/^git\@(.*?):.*$/, '\1')
+    if /^git@/ =~ origin_url
+      host = origin_url.sub(/^git@(.*?):.*$/, '\1')
       site = host_to_site(host, false)
     else
       uri = URI.parse(origin_url)
@@ -68,10 +68,10 @@ module GitHubService
       in_host_section = false
       host_name = nil
 
-      sections = config_lines.each do |line|
+      config_lines.each do |line|
         line.chop!
         if /^\s*Host\s+#{host_alias}\s*$/ =~ line
-            in_host_section = true
+          in_host_section = true
           next
         end
         if in_host_section and (/^\s*HostName\s+\S+\s*$/ =~ line)
@@ -141,7 +141,7 @@ module GitHubService
 
   def create_authorization
     logger.info("Authorizing #{user} to work with #{site}.")
-    auth = pw_client.create_authorization(:scopes => ['repo', 'user', 'gist'],
+    auth = pw_client.create_authorization(:scopes => %w(repo user gist),
                                           :note => 'Git-Process',
                                           :note_url => 'http://jdigger.github.com/git-process')
     config_auth_token = auth['token']

data/lib/git-process/new_fb.rb

@@ -8,7 +8,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.require 'shellwords'
+# limitations under the License.
 
 require 'git-process/git_process'
 

data/lib/git-process/parked_changes_error.rb

@@ -8,7 +8,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.require 'shellwords'
+# limitations under the License.
 
 require 'git-process/git_process_error'
 
@@ -19,6 +19,7 @@ module GitProc
 
     attr_reader :error_message, :lib
 
+
     def initialize(lib)
       @lib = lib
       msg = build_message

data/lib/git-process/pull_request.rb

@@ -8,7 +8,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.require 'shellwords'
+# limitations under the License.
 
 require 'git-process/git_process'
 require 'git-process/github_pull_request'

data/lib/git-process/rebase_to_master.rb

@@ -8,7 +8,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.require 'shellwords'
+# limitations under the License.
 
 require 'git-process/git_process'
 require 'git-process/git_rebase_error'
@@ -36,6 +36,7 @@ module GitProc
     end
 
 
+    #noinspection RubyControlFlowConversionInspection
     def runner
       if has_a_remote?
         fetch(server_name)
@@ -65,12 +66,12 @@ module GitProc
 
       parking_branch = mybranches['_parking_']
       if parking_branch
-        if (parking_branch.is_ahead_of(remote_master.name) and
-            !current_branch.contains_all_of(parking_branch.name))
+        if parking_branch.is_ahead_of(remote_master.name) and
+            !current_branch.contains_all_of(parking_branch.name)
 
           parking_branch.rename('_parking_OLD_')
 
-          logger.warn {bad_parking_branch_msg}
+          logger.warn { bad_parking_branch_msg }
         else
           parking_branch.delete!
         end
@@ -114,11 +115,11 @@ module GitProc
     def bad_parking_branch_msg
       hl = HighLine.new
       hl.color("\n***********************************************************************************************\n\n"+
-               "There is an old '_parking_' branch with unacounted changes in it.\n"+
-               "It has been renamed to '_parking_OLD_'.\n"+
-               "Please rename the branch to what the changes are about (`git branch -m _parking_OLD_ my_fb_name`),\n"+
-               " or remove it altogher (`git branch -D _parking_OLD_`).\n\n"+
-               "***********************************************************************************************\n", :red, :bold)
+                   "There is an old '_parking_' branch with unacounted changes in it.\n"+
+                   "It has been renamed to '_parking_OLD_'.\n"+
+                   "Please rename the branch to what the changes are about (`git branch -m _parking_OLD_ my_fb_name`),\n"+
+                   " or remove it altogher (`git branch -D _parking_OLD_`).\n\n"+
+                   "***********************************************************************************************\n", :red, :bold)
     end
 
   end

data/lib/git-process/sync.rb

@@ -8,7 +8,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.require 'shellwords'
+# limitations under the License.
 
 require 'git-process/git_lib'
 require 'git-process/git_process'
@@ -22,6 +22,7 @@ module GitProc
   class Sync < Process
     include ChangeFileHelper
 
+
     def initialize(dir, opts)
       opts[:force] = true if opts[:rebase]
 
@@ -38,6 +39,7 @@ module GitProc
     end
 
 
+    #noinspection RubyControlFlowConversionInspection
     def verify_preconditions
       super
 
@@ -56,9 +58,17 @@ module GitProc
 
     def runner
       @current_branch ||= branches.current
-      @remote_branch ||= "#{server_name}/#{@current_branch}"
+      @remote_branch ||= "#{server_name}/#@current_branch"
 
-      fetch(server_name)
+      # if the remote branch has changed, merge those changes in before
+      #   doing anything with the integration branch
+      old_sha = rev_parse(@remote_branch) rescue ''
+      fetch(server_name) if has_a_remote?
+      new_sha = rev_parse(@remote_branch) rescue ''
+      unless old_sha == new_sha
+        logger.info('There have been changes on this remote branch, so will merge them in.')
+        proc_merge(@remote_branch)
+      end
 
       if @do_rebase
         proc_rebase(integration_branch)
@@ -68,6 +78,8 @@ module GitProc
 
       if @local
         logger.debug("Not pushing to the server because the user selected local-only.")
+      elsif not has_a_remote?
+        logger.debug("Not pushing to the server because there is no remote.")
       elsif @current_branch == master_branch
         logger.warn("Not pushing to the server because the current branch is the mainline branch.")
       else
@@ -87,8 +99,8 @@ module GitProc
       fetch(server_name)
       new_sha = rev_parse(@remote_branch) rescue ''
       unless old_sha == new_sha
-        logger.warn("'#{@current_branch}' changed on '#{server_name}'"+
-                    " [#{old_sha[0..5]}->#{new_sha[0..5]}]; trying sync again.")
+        logger.warn("'#@current_branch' changed on '#{server_name}'"+
+                        " [#{old_sha[0..5]}->#{new_sha[0..5]}]; trying sync again.")
         runner # try again
       end
     end

data/lib/git-process/uncommitted_changes_error.rb

@@ -8,7 +8,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.require 'shellwords'
+# limitations under the License.
 
 require 'git-process/git_process_error'
 

data/lib/git-process/version.rb

@@ -8,13 +8,13 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.require 'shellwords'
+# limitations under the License.
 
 module GitProc
   module Version
     MAJOR = 1
     MINOR = 0
-    PATCH = 4
+    PATCH = 5
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

data/spec/FileHelpers.rb

@@ -4,6 +4,7 @@ include FileUtils
 module FileHelpers
   TEST_DIR = File.dirname(__FILE__)
 
+
   def dir_files(dir)
     Dir.entries(dir).grep(/^[^.]/)
   end

data/spec/GitRepoHelper.rb

@@ -34,7 +34,7 @@ module GitRepoHelper
   def create_files(file_names)
     Dir.chdir(gitprocess.workdir) do |dir|
       file_names.each do |fn|
-        gitprocess.logger.debug {"Creating #{dir}/#{fn}"}
+        gitprocess.logger.debug { "Creating #{dir}/#{fn}" }
         FileUtils.touch fn
       end
     end
@@ -44,7 +44,7 @@ module GitRepoHelper
 
   def change_file(filename, contents, lib = gitprocess)
     Dir.chdir(lib.workdir) do
-      File.open(filename, 'w') {|f| f.puts contents}
+      File.open(filename, 'w') { |f| f.puts contents }
     end
   end
 
@@ -69,7 +69,7 @@ module GitRepoHelper
   def clone(branch='master', remote_name = 'origin', &block)
     td = Dir.mktmpdir
 
-    logger.debug {"Cloning '#{tmpdir}' to '#{td}'"}
+    logger.debug { "Cloning '#{tmpdir}' to '#{td}'" }
 
     opts = {}
     opts[:quiet] = true if log_level == Logger::ERROR

data/spec/changed_file_helper_spec.rb

@@ -20,7 +20,7 @@ describe GitProc::ChangeFileHelper do
   include GitRepoHelper
 
   before(:each) do
-    create_files(['.gitignore'])
+    create_files(%w(.gitignore))
     gitprocess.commit('initial')
   end
 
@@ -52,7 +52,7 @@ describe GitProc::ChangeFileHelper do
 
       gp.merge('origin/master') rescue ''
 
-      expect {gp.offer_to_help_uncommitted_changes}.should raise_error GitProc::UncommittedChangesError
+      expect { gp.offer_to_help_uncommitted_changes }.should raise_error GitProc::UncommittedChangesError
     end
 
 

data/spec/git_abstract_merge_error_builder_spec.rb

@@ -52,13 +52,14 @@ describe GitProc::AbstractMergeErrorBuilder do
 
     builder.resolved_files.should == []
     builder.unresolved_files.should == ['a', 'b c']
-    match_commands [
-      'git config --global rerere.enabled true',
-      'git mergetool a b\ c',
-      '# Verify \'a\' merged correctly.',
-      '# Verify \'b c\' merged correctly.',
-      'git add a b\ c',
+    c = [
+        'git config --global rerere.enabled true',
+        'git mergetool a b\ c',
+        '# Verify \'a\' merged correctly.',
+        '# Verify \'b c\' merged correctly.',
+        'git add a b\ c',
     ]
+    match_commands c
   end
 
 
@@ -67,14 +68,15 @@ describe GitProc::AbstractMergeErrorBuilder do
     status.stub(:modified).and_return(['a', 'b c'])
     builder.stub(:error_message).and_return("\nResolved 'a' using previous resolution.\n")
 
-    builder.resolved_files.should == ['a']
+    builder.resolved_files.should == %w(a)
     builder.unresolved_files.should == ['b c']
-    match_commands [
-      '# Verify that \'rerere\' did the right thing for \'a\'.',
-      'git mergetool b\ c',
-      '# Verify \'b c\' merged correctly.',
-      'git add b\ c',
+    c = [
+        '# Verify that \'rerere\' did the right thing for \'a\'.',
+        'git mergetool b\ c',
+        '# Verify \'b c\' merged correctly.',
+        'git add b\ c',
     ]
+    match_commands c
   end
 
 
@@ -84,30 +86,32 @@ describe GitProc::AbstractMergeErrorBuilder do
     status.stub(:modified).and_return(['a', 'b c'])
     builder.stub(:error_message).and_return("\nResolved 'a' using previous resolution.\n")
 
-    builder.resolved_files.should == ['a']
+    builder.resolved_files.should == %w(a)
     builder.unresolved_files.should == ['b c']
-    match_commands [
-      '# Verify that \'rerere\' did the right thing for \'a\'.',
-      'git add a',
-      'git mergetool b\ c',
-      '# Verify \'b c\' merged correctly.',
-      'git add b\ c',
+    c = [
+        '# Verify that \'rerere\' did the right thing for \'a\'.',
+        'git add a',
+        'git mergetool b\ c',
+        '# Verify \'b c\' merged correctly.',
+        'git add b\ c',
     ]
+    match_commands c
   end
 
 
   it "merged with a file added in both branches" do
     lib.stub(:rerere_autoupdate?).and_return(false)
-    status.stub(:unmerged).and_return(['a'])
-    status.stub(:modified).and_return(['b'])
-    status.stub(:added).and_return(['a', 'c'])
-
-    builder.resolved_files.should == []
-    builder.unresolved_files.should == ['a']
-    match_commands [
-      '# \'a\' was added in both branches; Fix the conflict.',
-      'git add a',
+    status.stub(:unmerged).and_return(%w(a))
+    status.stub(:modified).and_return(%w(b))
+    status.stub(:added).and_return(%w(a c))
+
+    builder.resolved_files.should == %w()
+    builder.unresolved_files.should == %w(a)
+    c = [
+        '# \'a\' was added in both branches; Fix the conflict.',
+        'git add a',
     ]
+    match_commands c
   end
 
 end