versionator 0.0.4 → 0.1.0

data/README.rdoc

@@ -12,6 +12,22 @@ Install with bundler
 
     $ bundle install
 
+== Github
+
+Versionator pushes the git tag and VERSION file to your project's github repository (origin master) each time you run the rake tasks.  It is recommended that you commit all code and push to master before bumping your version.  
+
+Order of execution for the rake tasks:
+
+1. Bump the version locally based on the version in /your_app/VERSION
+2. Write the new version to /your_app/VERSION
+3. git checkout master
+4. git pull
+5. git tag new version
+6. git commit (This will commit your new VERSION file)
+7. git push (new tag and VERSION file)
+
+TODO: Currently there is no error checking in place for each of these automated steps.  The rake tasks should be changed to stop execution if there is code to be committed or new code from the pull
+
 == Usage
 
 There are 3 rake tasks for each version category.  If the VERSION file does not exist in the app root directory, the rake task will create it automatically
@@ -41,7 +57,7 @@ Example: v1.1.1 moves to v2.0.0
 * Commit and push until you are happy with your contribution
 * Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
 * Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
-*** Tests are located in a separate repository, since their needs to be a project to tag against.  Here is the test repo: git@github.com:johnmcaliley/test_app.git
+*** Tests are located in a separate repository, since their needs to be a project to tag against.  Here is the test repo: https://github.com/johnmcaliley/test_app
 
 == Copyright
 

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.1.0

data/lib/versionator/git.rb

@@ -1,28 +1,32 @@
 module Versionator
   module Git
-    def git_checkout
-      git_command("git checkout master")
+    def git_current_branch
+      git_command("git branch").split(/\n/).grep(/\*/).first.gsub('* ', '')
     end
 
-    def git_pull
-      git_command("git pull origin master")
+    def git_checkout(branch = 'master')
+      git_command("git checkout #{branch}")
+    end
+
+    def git_pull(branch = 'master')
+      git_command("git pull origin #{branch}")
     end
 
     def git_tag
       git_command("git tag v#{version_name}")
     end
 
-    def git_commit(message=nil)
+    def git_commit(message = nil)
       message = "tag new release v#{version_name}" if message.blank?
       git_command("git commit -a -m '#{message}'")
     end
     
-    def git_push
-      git_command("git push origin master --tags")
+    def git_push(branch = 'master')
+      git_command("git push origin #{branch} --tags")
     end
     
     def git_command(str)
       systemu(str).drop(1).join(" ")
     end
   end
-end
+end

data/lib/versionator/version.rb

@@ -40,18 +40,29 @@ module Versionator
     end
 
     def git_release
-      output = git_checkout
-      output += git_pull
-      output += git_tag
-      output += git_commit
-      output += git_push
+      current_branch = git_current_branch
+      if current_branch == 'master' || confirm_branch(current_branch)
+        output = git_checkout(current_branch)
+        output += git_pull(current_branch)
+        output += git_tag
+        output += git_commit
+        output += git_push(current_branch)
+      else
+        output = "Aborting tag. Check out the correct branch and try again."
+      end
       output
     end
 
+    def confirm_branch(branch)
+      print "Tagging new version on current branch [#{branch}]. Continue? [y]: "
+      response = $stdin.gets
+      (response =~ /y/i || response == "\n")
+    end
+
     def release(category)
       bump(category)
       write(version_name)
       git_release
     end
   end
-end
+end

data/versionator.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{versionator}
-  s.version = "0.0.4"
+  s.name = "versionator"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John McAliley"]
-  s.date = %q{2011-07-21}
-  s.description = %q{set of rake tasks that allow you to update your release version, tag it and push to github}
-  s.email = %q{john.mcaliley@gmail.com}
+  s.date = "2012-03-13"
+  s.description = "set of rake tasks that allow you to update your release version, tag it and push to github"
+  s.email = "john.mcaliley@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -32,14 +32,13 @@ Gem::Specification.new do |s|
     "lib/versionator/version.rb",
     "versionator.gemspec"
   ]
-  s.homepage = %q{http://github.com/charlotte-ruby/versionator}
+  s.homepage = "http://github.com/charlotte-ruby/versionator"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{versioning for your Rails 3 app}
+  s.rubygems_version = "1.8.10"
+  s.summary = "versioning for your Rails 3 app"
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

metadata

@@ -1,101 +1,80 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: versionator
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 4
-  version: 0.0.4
+version: !ruby/object:Gem::Version
+  version: 0.1.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - John McAliley
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-21 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-03-13 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2173366100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2173366100
+- !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &2173365620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2173365620
+- !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &2173365140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 5
-        - 2
+      - !ruby/object:Gem::Version
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2173365140
+- !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &2173364660 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2173364660
+- !ruby/object:Gem::Dependency
   name: systemu
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &2173364180 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id005
-description: set of rake tasks that allow you to update your release version, tag it and push to github
+  version_requirements: *2173364180
+description: set of rake tasks that allow you to update your release version, tag
+  it and push to github
 email: john.mcaliley@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
-files: 
+files:
 - .document
 - Gemfile
 - Gemfile.lock
@@ -110,38 +89,32 @@ files:
 - lib/versionator/railties/versionator.rake
 - lib/versionator/version.rb
 - versionator.gemspec
-has_rdoc: true
 homepage: http://github.com/charlotte-ruby/versionator
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 257450501227032483
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -1753993591317228235
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: versioning for your Rails 3 app
 test_files: []
-