gitsu 2.0.1 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9fcb4e063806b45b31ab1b4bcc30778e940a622a
-  data.tar.gz: a9d60a564b7471e0b955a23c305d8514607aa6dc
+  metadata.gz: c6052b324417250518afe887bcb191d981627958
+  data.tar.gz: 23ede1aa4fd3875f1dba10b1ee388d2f2fc50e00
 SHA512:
-  metadata.gz: ea559f31632320ecc0608a2250a68b55838d0033685c12fde8e19b70a1f68f91a7616550fd1accb100435457241707231542bab66688be0b3a1135858acf8dff
-  data.tar.gz: 98cabf2934b2b6d50ed5531c2bcefe0bf5794e2de11ad19035415688f822a2b2f59faf6e79bc7eb5cf2a3baee3e90b5691df14e8cadff032bad7f1209011c6b1
+  metadata.gz: 70dc9713701d5e8ea3170df85c5faddf5460729b3a6326b082e2ed442d0ff99fb4e6502011b431646c65b720c21dfb69f8ca4875e303c9cba4b01d0d82af21a2
+  data.tar.gz: 33553abab3b5f6e8a4a49e50505e2c4fc549ba78f9029dd98cc746fd8bbb09f75d11a40e07e3bae87b41dc4e74aad71faa06e0b1b1bcb3ba63aa102392dd2290

data/.travis.yml

@@ -20,7 +20,3 @@ rvm:
   - "1.9.2"
   - "1.9.3"
   - "2.0.0"
-  - jruby-18mode
-  - jruby-19mode
-  - rbx-18mode
-  - rbx-19mode

data/README.md

@@ -4,7 +4,8 @@
 [![Coverage Status](https://coveralls.io/repos/drrb/gitsu/badge.png?branch=master)](https://coveralls.io/r/drrb/gitsu)
 [![Code Climate](https://codeclimate.com/github/drrb/gitsu.png)](https://codeclimate.com/github/drrb/gitsu)
 
-[![Gem Version](https://badge.fury.io/rb/gitsu.png)](http://badge.fury.io/rb/gitsu)
+[![Gem Version](https://badge.fury.io/rb/gitsu.png)](https://badge.fury.io/rb/gitsu)
+[![Dependency Status](https://gemnasium.com/drrb/gitsu.png)](https://gemnasium.com/drrb/gitsu)
 
 Gitsu helps to manage your Git users, by making it easy to switch
 between users. Gitsu also supports pair programming by allowing you

data/Rakefile

@@ -40,7 +40,7 @@ task 'push-release' => ['check-license', :verify] do
     end
 
     version = GitSu::Version.prompt($stdin, $stdout, "Enter the version to release", GitSu::Version.current)
-    next_version = GitSu::Version.prompt($stdin, $stdout, "Enter the next development version", version.next_minor)
+    next_version = GitSu::Version.prompt($stdin, $stdout, "Enter the next development version", version.next_patch)
 
     puts "Releasing #{version} and preparing for #{next_version}"
 
@@ -64,4 +64,5 @@ end
 
 def update_version(new_version)
     system(%q[sed -i '' -E 's/VERSION = ".*"/VERSION = "] + new_version.to_s + %q["/' lib/gitsu/version.rb])
+    GitSu::VERSION.replace new_version.to_s
 end

data/features/switch_to_multiple_users.feature

@@ -53,7 +53,7 @@ Feature: Switch to multiple users
         b@example.com: Johnny B
         """
         When I type "git su ja jb ja"
-        Then I should see "Couldn't find a combination of unique users matching 'ja', 'jb' and 'ja'"
+        Then I should see "Couldn't find a combination of users matching 'ja', 'jb' and 'ja'"
 
     Scenario: No group email configured
         Given the Git configuration has "gitsu.groupEmailAddress" set to ""

data/gitsu.gemspec

@@ -38,9 +38,10 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   # Dependencies
-  gem.add_development_dependency('coveralls', '>= 0.6.3')
-  gem.add_development_dependency('json') # Coveralls needs it
-  gem.add_development_dependency('rake')
-  gem.add_development_dependency('rspec')
-  gem.add_development_dependency('cucumber')
+  gem.add_development_dependency 'bundler', '~> 1.3'
+  gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'coveralls', '>= 0.6.3'
+  gem.add_development_dependency 'json' # Coveralls needs it
+  gem.add_development_dependency 'rspec'
+  gem.add_development_dependency 'cucumber'
 end

data/lib/gitsu/array.rb

@@ -21,11 +21,15 @@ class Array
         elsif size == 1
             last.to_s
         else
-            "#{self[0..-2].map{|e| e.to_s}.join(", ")} and #{last.to_s}"
+            "#{self[0...-1].map{|e| e.to_s}.join(", ")} and #{last.to_s}"
         end
     end
 
     def pluralize(word)
         size > 1 ? word + "s" : word
     end
+
+    def quote
+        map { |element| "'#{element}'" }
+    end
 end

data/lib/gitsu/switcher.rb

@@ -99,7 +99,7 @@ module GitSu
 
         def add_parsed_user(user)
             if @user_list.list.include? user
-                @output.puts "User '#{user}' already in user list"
+                @output.puts "User '#{user}' already in user list (try switching to them with 'git su #{user.initials}')"
             else
                 @user_list.add user
                 @output.puts "User '#{user}' added to users"

data/lib/gitsu/user.rb

@@ -82,6 +82,10 @@ module GitSu
             end
         end
 
+        def initials
+            names.join(" ").split(" ").map { |word| word.chars.first }.join.downcase
+        end
+
         def none?
             self === NONE
         end

data/lib/gitsu/user_list.rb

@@ -16,6 +16,22 @@
 
 module GitSu
     class UserList
+        MATCH_STRATEGIES = [
+            # Whole word of name
+            lambda { |search_term, user| user.name =~ /\b#{search_term}\b/i },
+
+            # Beginning of word in name
+            lambda { |search_term, user| user.name =~ /\b#{search_term}/i },
+
+            # Initials
+            lambda { |search_term, user| user.initials =~ /#{search_term}/i },
+
+            # Segment anywhere in name or email
+            lambda do |search_term, user|
+                "#{user.name} #{user.email}" =~ /#{search_term}/i
+            end
+        ]
+
         def initialize(user_file)
             @user_file = user_file
         end
@@ -37,7 +53,7 @@ module GitSu
                 end
             end
 
-            find_unique_combination(searches) or raise "Couldn't find a combination of unique users matching #{search_terms.map {|t| "'#{t}'" }.to_sentence}"
+            find_unique_combination(searches) or raise "Couldn't find a combination of users matching #{search_terms.quote.to_sentence}"
         end
 
         private
@@ -51,7 +67,7 @@ module GitSu
         def all_matching_users(all_users, search_terms)
             searches = search_terms.map {|search_term| Search.new(search_term)}
             searches.each do |search|
-                match_strategies.each do |strategy|
+                MATCH_STRATEGIES.each do |strategy|
                     search.matches += all_users.select { |user| strategy.call(search.term, user) }
                 end
                 search.matches.uniq!
@@ -77,27 +93,6 @@ module GitSu
                 combo.uniq.size == combo.size
             end
         end
-
-        def match_strategies
-            [
-            # Whole word of name
-            lambda { |search_term, user| user.name =~ /\b#{search_term}\b/i },
-
-            # Beginning of word in name
-            lambda { |search_term, user| user.name =~ /\b#{search_term}/i },
-
-            # Initials
-            lambda do |search_term, user|
-                initials = user.name.split(" ").map { |word| word.chars.first }.join
-                initials =~ /#{search_term}/i
-            end,
-
-            # Segment anywhere in name or email
-            lambda do |search_term, user|
-                "#{user.name} #{user.email}" =~ /#{search_term}/i
-            end
-            ]
-        end
     end
 end
 

data/lib/gitsu/version.rb

@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 module GitSu
-    VERSION = "2.0.1"
+    VERSION = "2.0.3"
 
     class Version
         class ParseError < StandardError
@@ -48,7 +48,11 @@ module GitSu
         end
 
         def next_minor
-            Version.new(@major, @minor + 1, @patch)
+            Version.new(@major, @minor + 1, 0)
+        end
+
+        def next_patch
+            Version.new(@major, @minor, @patch + 1)
         end
 
         def ==(other)

data/spec/gitsu/array_spec.rb

@@ -68,4 +68,18 @@ describe Array do
             end
         end
     end
+
+    describe "#quote" do
+        let(:array) { [:apple, :orange] }
+
+        it "quotes all elements in the array" do
+            array.quote.should == ["'apple'", "'orange'"]
+        end
+
+        context "when the array is empty" do
+            it "returns an empty array" do
+                [].quote.should == []
+            end
+        end
+    end
 end

data/spec/gitsu/switcher_spec.rb

@@ -173,7 +173,7 @@ module GitSu
             context "when the user already exists in the user list" do
                 it "doesn't add the user to the user list" do
                     user_list.should_receive(:list).and_return [User.new('John Galt', 'jgalt@example.com')]
-                    output.should_receive(:puts).with("User 'John Galt <jgalt@example.com>' already in user list")
+                    output.should_receive(:puts).with("User 'John Galt <jgalt@example.com>' already in user list (try switching to them with 'git su jg')")
                     switcher.add("John Galt <jgalt@example.com>")
                 end
             end

data/spec/gitsu/user_list_spec.rb

@@ -110,7 +110,7 @@ module GitSu
                         user_file.add("Johnny A", "ja@example.com")
                         user_file.add("Johnny B", "jb@example.com")
 
-                        expect {user_list.find("ja", "jb", "j")}.to raise_error "Couldn't find a combination of unique users matching 'ja', 'jb' and 'j'"
+                        expect {user_list.find("ja", "jb", "j")}.to raise_error "Couldn't find a combination of users matching 'ja', 'jb' and 'j'"
                     end
                 end
                 context "when a search term only matches a user that was already matched, but the matching search term matched multiple users" do

data/spec/gitsu/version_spec.rb

@@ -60,12 +60,22 @@ module GitSu
         end
 
         describe "#next_minor" do
-            it "increments the minor version by 1" do
+            it "increments the minor version by 1 and resets the patch version to 0" do
                 version = Version.parse("1.2.3")
                 next_version = version.next_minor
                 next_version.major.should be 1
                 next_version.minor.should be 3
-                next_version.patch.should be 3
+                next_version.patch.should be 0
+            end
+        end
+
+        describe "#next_patch" do
+            it "increments the patch number by 1" do
+                version = Version.parse("1.2.3")
+                next_version = version.next_patch
+                next_version.major.should be 1
+                next_version.minor.should be 2
+                next_version.patch.should be 4
             end
         end
     end

metadata

@@ -1,31 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: gitsu
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.3
 platform: ruby
 authors:
 - drrb
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-21 00:00:00.000000000 Z
+date: 2013-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -39,7 +39,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.6.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.6.3
+- !ruby/object:Gem::Dependency
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='