gitsu 0.0.1 → 0.0.2

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+rvm:
+  - "1.8.7"
+  - "1.9.2"
+  - "1.9.3"
+  - jruby-18mode # JRuby in 1.8 mode
+  - jruby-19mode # JRuby in 1.9 mode
+  - rbx-18mode
+  - rbx-19mode

data/README.md

@@ -1,6 +1,10 @@
-# GitSu
+# Gitsu
 
-GitSu helps to manage your Git users, by making it easy to switch
+[![Build Status](https://travis-ci.org/drrb/gitsu.png)](https://travis-ci.org/drrb/gitsu)
+[![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)
+
+Gitsu helps to manage your Git users, by making it easy to switch
 between users. 
 
 ## Installation
@@ -9,7 +13,7 @@ between users.
 
 ## Usage
 
-GitSu is intended to be used from the command line, through Git.
+Gitsu is intended to be used from the command line, through Git.
 
 To switch the configured Git user:
 
@@ -17,7 +21,7 @@ To switch the configured Git user:
 
     Switched local user to John Galt <jgalt@tcmc.com>
 
-To make it easier to switch users, tell GitSu about some users.
+To make it easier to switch users, tell Gitsu about some users.
 
     $ git su --add "John Galt <jgalt@tcmc.com>"
     $ git su --add "Raphe Rackstraw <rack@hp.royalnavy.mod.uk>"

data/Rakefile

@@ -1,3 +1,31 @@
-require "bundler/gem_tasks"
+lib_path = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift lib_path unless $LOAD_PATH.include? lib_path
+require 'gitsu'
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+require 'cucumber/rake/task'
 
-task :default => :install
+Cucumber::Rake::Task.new(:features)
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => [:spec, :features]
+
+task :push_release => [:spec, :features] do
+    git = GitSu::Git.new(GitSu::Shell.new)
+    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)
+
+    puts "Releasing #{version} and preparing for #{next_version}"
+
+    update_version(version)
+    git.commit("lib/gitsu/version.rb", "Preparing for release #{version}")
+    # TODO: check if this works as a symbol, otherwise just use string
+    #Rake::Task["release"].invoke
+    Rake::Task[:release].invoke
+    update_version(next_version)
+    git.commit("lib/gitsu/version.rb", "Preparing for next development iteration")
+end
+
+def update_version(new_version)
+    system(%q[sed -i '' -E 's/VERSION = ".*"/VERSION = "] + new_version.to_s + %q["/' lib/gitsu/version.rb])
+end

data/TODO

@@ -3,8 +3,12 @@ Features
 Make colors configurable because people like that stuff
 Support multiple users at once for pairing
 
+Tasks
+--------
+Check for changes (and abort if you find them) during release
+
 Bugs
--------
+--------
 
 Tests
--------
+--------

data/gitsu.gemspec

@@ -9,11 +9,20 @@ Gem::Specification.new do |gem|
   gem.authors       = ["drrb"]
   gem.email         = ["drrb@github.com"]
   gem.description   = %q{Manage your Git users}
-  gem.summary       = %q{Gitsu allows you to quickly configure and switch between Git users}
+  gem.summary       = <<-EOF
+    Gitsu allows you to quickly configure and switch between Git users, for
+    different projects and contexts
+  EOF
   gem.homepage      = "http://drrb.github.com/gitsu"
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
+
+  # Dependencies
+  gem.add_development_dependency('coveralls')
+  gem.add_development_dependency('rake')
+  gem.add_development_dependency('rspec')
+  gem.add_development_dependency('cucumber')
 end

data/lib/gitsu.rb

@@ -7,3 +7,4 @@ require 'gitsu/switcher'
 require 'gitsu/user_file'
 require 'gitsu/user_list'
 require 'gitsu/user'
+require 'gitsu/version'

data/lib/gitsu/git.rb

@@ -108,11 +108,13 @@ module GitSu
         def render_user(scope)
             render selected_user(scope)
         end
-        
+
+        def commit(file, message)
+            @shell.execute("git commit #{file} --message='#{message}'")
+        end
     end
 
     class CachingGit < Git
-
         def get_color(color_name)
             @colors ||= {}
             #TODO: what if it's an invalid color?

data/lib/gitsu/version.rb

@@ -1,3 +1,50 @@
 module GitSu
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
+
+    class Version
+        class ParseError < StandardError
+        end
+
+        REGEX = /(\d+)\.(\d+).(\d+)/
+        def self.parse(string)
+            raise ParseError, "Couldn't parse string '#{string}' as version" unless REGEX =~ string
+            parts = REGEX.match(string)[1..3].map {|e| e.to_i }
+            Version.new(*parts)
+        end
+
+        def self.current
+            Version.parse(VERSION)
+        end
+
+        def self.prompt(input, output, prompt, default)
+            output.print "#{prompt} [#{default}]: "
+            value = input.gets.strip
+            if value.empty?
+                default
+            else
+                Version.parse value
+            end
+        end
+
+        attr_reader :major, :minor, :patch
+        def initialize(major, minor, patch)
+            @major, @minor, @patch = major, minor, patch
+        end
+
+        def next_minor
+            Version.new(@major, @minor + 1, @patch)
+        end
+
+        def ==(other)
+            eql? other
+        end
+
+        def eql?(other)
+            major = other.major && minor == other.minor && patch == other.patch
+        end
+
+        def to_s
+            "#{major}.#{minor}.#{patch}"
+        end
+    end
 end

data/spec/gitsu/git_spec.rb

@@ -185,5 +185,12 @@ module GitSu
                 end
             end
         end
+
+        describe "#commit" do
+            it "commits a file to the repository with the specified message" do
+                shell.should_receive(:execute).with("git commit file.dat --message='Committing changes'")
+                git.commit("file.dat", "Committing changes")
+            end
+        end
     end
 end

data/spec/gitsu/version_spec.rb

@@ -0,0 +1,56 @@
+require 'spec_helper'
+
+module GitSu
+    describe Version do
+        describe "#parse" do
+            it "parses a version string" do
+                version = Version.parse("1.23.456")
+                version.major.should be 1
+                version.minor.should be 23
+                version.patch.should be 456
+            end
+            context "when the input is invalid" do
+                it "raises an exception" do
+                    expect {Version.parse "x.x.x"}.to raise_error Version::ParseError
+                end
+            end
+        end
+
+        describe "#prompt" do
+            let(:input) { double('input') }
+            let(:output) { double('output') }
+            let(:default) { Version.parse("1.2.3") }
+
+            it "prompts the user to input a version" do
+                output.should_receive(:print).with "Enter version [1.2.3]: "
+                input.should_receive(:gets).and_return "4.5.6"
+                version = Version.prompt(input, output, "Enter version", default)
+                version.should == Version.parse("4.5.6")
+            end
+            context "when no version is provided by user" do
+                it "returns the default value" do
+                    output.should_receive(:print).with "Enter version [1.2.3]: "
+                    input.should_receive(:gets).and_return ""
+                    version = Version.prompt(input, output, "Enter version", default)
+                    version.should == Version.parse("1.2.3")
+                end
+            end
+        end
+
+        describe "#current" do
+            it "returns the current version" do
+                Version.parse(VERSION).should == Version.current
+            end
+        end
+
+        describe "#next_minor" do
+            it "increments the minor version by 1" 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
+            end
+        end
+    end
+end

data/spec/spec_helper.rb

@@ -1 +1,3 @@
 require 'gitsu'
+require 'coveralls'
+Coveralls.wear!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitsu
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,72 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-17 00:00:00.000000000 Z
-dependencies: []
+date: 2013-03-18 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Manage your Git users
 email:
 - drrb@github.com
@@ -21,6 +85,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -59,6 +124,7 @@ files:
 - spec/gitsu/switcher_spec.rb
 - spec/gitsu/user_list_spec.rb
 - spec/gitsu/user_spec.rb
+- spec/gitsu/version_spec.rb
 - spec/spec_helper.rb
 homepage: http://drrb.github.com/gitsu
 licenses: []
@@ -83,7 +149,8 @@ rubyforge_project:
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: Gitsu allows you to quickly configure and switch between Git users
+summary: Gitsu allows you to quickly configure and switch between Git users, for different
+  projects and contexts
 test_files:
 - features/add_user.feature
 - features/change_user_in_different_scopes.feature
@@ -103,4 +170,5 @@ test_files:
 - spec/gitsu/switcher_spec.rb
 - spec/gitsu/user_list_spec.rb
 - spec/gitsu/user_spec.rb
+- spec/gitsu/version_spec.rb
 - spec/spec_helper.rb