git-process 1.0.2 → 1.0.3

data/CHANGELOG.md

@@ -1,4 +1,20 @@
-# CHANGELOG - 1.0.1 #
+# CHANGELOG - 1.0.3 #
+
+### Since 1.0.2 ###
+
+* Removes the last of the gem dependencies that require native code. This makes it fully compatible
+  with systems like Windows.
+* Adds an option to explicitly set the remote server name.
+
+### Since 1.0.1 ###
+
+* Changes to dependencies to allow this to work on both Ruby 1.8 and 1.9
+
+### Since 0.9.7 ###
+
+* Adds --keep option to git-to-master
+* Fixes problem trying to add/remove an empty list of files
+* Documentation updates
 
 ### Since 0.9.7 ###
 
@@ -17,4 +33,4 @@
 * Adds support for spaces and renames in Status
 * No longer complains if it can't find _parking_
 * Prompts to remove the local version of the integration branch
-* Adds help for handling changed files
+* Adds help for handling changed files

data/Gemfile

@@ -5,7 +5,6 @@ group :default do
   gem "json", "~> 1.7.3"
   gem "trollop", "~> 1.16.2" # CLI options parser
   gem "highline", "~> 1.6.12" # user CLI interaction
-  gem "ruby-termios", "~> 0.9.4"  # used by highline to make things a little nicer
 end
 
 group :development do

data/Gemfile.lock

@@ -29,7 +29,6 @@ GEM
     rspec-expectations (2.10.0)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.10.1)
-    ruby-termios (0.9.6)
     trollop (1.16.2)
     webmock (1.8.7)
       addressable (>= 2.2.7)
@@ -46,7 +45,6 @@ DEPENDENCIES
   rake (~> 0.9.2)
   redcarpet (~> 2.1.1)
   rspec (~> 2.10.0)
-  ruby-termios (~> 0.9.4)
   trollop (~> 1.16.2)
   webmock (~> 1.8.7)
   yard (~> 0.8.2.1)

data/README.md

@@ -9,10 +9,23 @@ See the F.A.Q. for a much more complete explanation for the thoughts and assumpt
 
 # Installation #
 
+## Unix-based OS (OSX, Linux, etc.) Installation ##
+
     $ sudo gem install git-process
 
 Some older operating systems (such as OSX 10.6) are using an old version of RubyGems, which can cause installation problems. Do "`sudo gem update --system`" to fix.
 
+## Windows Installation ##
+
+1. Run http://cygwin.com/setup.exe
+2. Go through the various prompts and then select to install "git", "curl", "ruby" and "openssh" (along with their dependencies)
+3. Open a Cygwin terminal
+4. `curl -L -O http://production.cf.rubygems.org/rubygems/rubygems-1.8.24.tgz`
+5. `tar xfz rubygems-1.8.24.tgz`
+6. `cd rubygems-1.8.24`
+7. `ruby setup.rb`
+8. `gem install git-process`
+
 
 # Overview #
 
@@ -90,6 +103,7 @@ $ git to-master              # 6
 
 * `gitProcess.integrationBranch` : The name of the integration branch. Defaults to `master`, but can be set to `develop` or other.
 * `gitProcess.keepLocalIntegrationBranch` : Controls asking about removing the local integration branch. Defaults to 'false' (i.e., do not assume the branch should be there).
+* `gitProcess.remoteName` : Explicitly sets the remote server name to use.
 
 
 # Assumptions #
@@ -109,6 +123,7 @@ $ git to-master              # 6
 * The first time you use a GitHub feature (e.g., "`git pull-request`"), this will ask for your username and password. It does not store them, but instead uses them to get an OAuth2 token, which is stored in "`git config gitProcess.github.authToken`".
 * If you want to use a different integration branch other than "`master`", set the "`gitProcess.integrationBranch`" configuration value. (e.g., "`git config gitProcess.integrationBranch my-integ-branch`")
 * This tries to respond "intelligently" to the use of 'rerere'.
+* By default the first server name reported by `git remote` is used as the server/remote name. Since most projects only have a single remote (i.e., "origin") this works most of the time. But if you have multiple remotes and want to explicitly set it, use the `gitProcess.remoteName` configuration option.
 
 
 # F.A.Q. #

data/bin/git-sync

@@ -28,6 +28,11 @@ If there is a problem, such as a merge conflict, this tries to \
 resolve it automatically. If it can not do so in an automated way, \
 if tells you the steps involved for doing so manually.
 
+By default the first server name reported by 'git remote' is used as the server/remote name. \
+Since most projects only have a single remote (i.e., "origin") this works most of the time. \
+But if you have multiple remotes and want to explicitly set it, use the \
+'gitProcess.remoteName' configuration option.
+
 EXAMPLE
 
 Assuming that the current branch is called "interesting_changes" and the integration \

data/bin/git-to-master

@@ -38,6 +38,11 @@ everything is done on a feature branch.  In addition to being a much \
 safer and more flexible way of working in general, it is also a \
 requirement to take advantage of Pull Request functionality.
 
+By default the first server name reported by 'git remote' is used as the server/remote name. \
+Since most projects only have a single remote (i.e., "origin") this works most of the time. \
+But if you have multiple remotes and want to explicitly set it, use the \
+'gitProcess.remoteName' configuration option.
+
 EXAMPLE
 
 Assuming that the current branch is called "interesting_changes" and the integration \

data/git-process.gemspec

@@ -12,7 +12,6 @@ gemspec = Gem::Specification.new do |gem|
   gem.add_dependency "json", "~> 1.7.3"
   gem.add_dependency "trollop", "~> 1.16.2" # CLI options parser
   gem.add_dependency "highline", "~> 1.6.12" # user CLI interaction
-  gem.add_dependency "ruby-termios", "~> 0.9.4"  # used by highline to make things a little nicer
 
   gem.files         = `git ls-files`.split($\).delete_if{|f| f =~ /^\./}
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/lib/git-process/git_lib.rb

@@ -321,10 +321,13 @@ module GitProc
 
     def remote_name
       unless @remote_name
-        remote_str = command(:remote)
-        unless remote_str == nil or remote_str.empty?
-          @remote_name = remote_str.split(/\n/)[0]
-          raise "!@remote_name.is_a? String" unless @remote_name.is_a? String
+        @remote_name = config('gitProcess.remoteName')
+        if @remote_name.nil? or @remote_name.empty?
+          remote_str = command(:remote)
+          unless remote_str == nil or remote_str.empty?
+            @remote_name = remote_str.split(/\n/)[0]
+            raise "!@remote_name.is_a? String" unless @remote_name.is_a? String
+          end
         end
         logger.debug {"Using remote name of '#{@remote_name}'"}
       end

data/lib/git-process/version.rb

@@ -14,7 +14,7 @@ module GitProc
   module Version
     MAJOR = 1
     MINOR = 0
-    PATCH = 2
+    PATCH = 3
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

data/spec/git_lib_spec.rb

@@ -17,11 +17,11 @@ describe GitProc::GitLib do
 
       @workdir = workdir
       if workdir
-        unless File.directory?(File.join(workdir, '.git'))
+        if File.directory?(File.join(workdir, '.git'))
+          logger.debug { "Opening existing repository at #{workdir}" }
+        else
           logger.info { "Initializing new repository at #{workdir}" }
           command(:init)
-        else
-          logger.debug { "Opening existing repository at #{workdir}" }
         end
       end
     end
@@ -176,6 +176,17 @@ describe GitProc::GitLib do
       end
     end
 
+
+    it "should work with an overridden remote name" do
+      change_file_and_commit('a', '')
+
+      clone('master', 'a_remote') do |gl|
+        gl.config('gitProcess.remoteName', 'something_else')
+
+        gl.remote_name.should == 'something_else'
+      end
+    end
+
   end
 
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: git-process
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 17
+  prerelease: 
   segments: 
   - 1
   - 0
-  - 2
-  version: 1.0.2
+  - 3
+  version: 1.0.3
 platform: ruby
 authors: 
 - Jim Moore
@@ -14,79 +15,72 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-27 00:00:00 -06:00
-default_executable: 
+date: 2012-09-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 1
         - 4
         - 0
         version: 1.4.0
-  name: octokit
-  requirement: *id001
   prerelease: false
-- !ruby/object:Gem::Dependency 
+  requirement: *id001
   type: :runtime
+  name: octokit
+- !ruby/object:Gem::Dependency 
   version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 1
         - 7
         - 3
         version: 1.7.3
-  name: json
-  requirement: *id002
   prerelease: false
-- !ruby/object:Gem::Dependency 
+  requirement: *id002
   type: :runtime
+  name: json
+- !ruby/object:Gem::Dependency 
   version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 83
         segments: 
         - 1
         - 16
         - 2
         version: 1.16.2
-  name: trollop
-  requirement: *id003
   prerelease: false
-- !ruby/object:Gem::Dependency 
+  requirement: *id003
   type: :runtime
+  name: trollop
+- !ruby/object:Gem::Dependency 
   version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 1
         - 6
         - 12
         version: 1.6.12
-  name: highline
-  requirement: *id004
   prerelease: false
-- !ruby/object:Gem::Dependency 
+  requirement: *id004
   type: :runtime
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 4
-        version: 0.9.4
-  name: ruby-termios
-  requirement: *id005
-  prerelease: false
+  name: highline
 description: A set of scripts to make working with git easier and more consistent
 email: 
 - moore.jim@gmail.com
@@ -146,7 +140,6 @@ files:
 - spec/rebase_to_master_spec.rb
 - spec/spec_helper.rb
 - spec/sync_spec.rb
-has_rdoc: true
 homepage: http://jdigger.github.com/git-process/
 licenses: 
 - ASL2
@@ -156,25 +149,29 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 57
       segments: 
       - 1
       - 8
       - 7
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: A set of scripts for a good git process
@@ -192,3 +189,4 @@ test_files:
 - spec/rebase_to_master_spec.rb
 - spec/spec_helper.rb
 - spec/sync_spec.rb
+has_rdoc: