knife-community 0.1.1 → 0.2.0

data/.gitignore

@@ -19,5 +19,7 @@ doc/
 
 Gemfile.lock
 .rvmrc
+.ruby-gemset
+.ruby-version
 
 bin/

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# v0.2.0 - May 2, 2013
+
+- Enhancement: Added a flag for `--tag-prefix` (GH-9, requested by @fnichol)
+- General: started adding rspec unit tests to get better test coverage
+
 # v0.1.1 - March 1, 2013
 
 - BugFix: Version bumper was updating more than it should, in the case where a version string was found more than once in `metadata.rb`.

data/Rakefile

@@ -1,7 +1,7 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
 
-task :default => [:features, :tailor]
+task :default => [:spec, :features, :tailor]
 
 # https://github.com/turboladen/tailor
 require 'tailor/rake_task'
@@ -18,6 +18,11 @@ Cucumber::Rake::Task.new(:features) do |t|
   t.cucumber_opts += ['--format pretty']
 end
 
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.rspec_opts = "--color"
+end
+
 # https://github.com/guard/guard
 require 'guard'
 desc "Start up guard, does not exit until told to with 'q'."

data/lib/chef/knife/community_release.rb

@@ -46,31 +46,41 @@ module KnifeCommunity
       :default => true,
       :description => "Indicates whether the commits and tags should be pushed to pushed to the default git remote."
 
+    option :tag_prefix,
+      :long => "--tag-prefix TAGPREFIX",
+      :description => "Prefix for Git tag name, followed by version"
+
     option :site_share,
       :long => "--[no-]site-share",
       :boolean => true,
       :default => true,
       :description => "Indicates whether the cookbook should be pushed to the community site."
 
-    def run
+    def setup
       self.config = Chef::Config.merge!(config)
       validate_args
       # Set variables for global use
       @cookbook = name_args.first
       @version = Versionomy.parse(name_args.last) if name_args.size > 1
+      return @cookbook, @version, config
+    end
+
+    def run
+      self.setup
 
       ui.msg "Starting to validate the envrionment before changing anything..."
       validate_cookbook_exists
       validate_repo
       validate_repo_clean
       validate_version_sanity
-      validate_no_existing_tag
+      validate_no_existing_tag(get_tag_string)
+      # TODO: skip next step if --no-git-push is provided
       validate_target_remote_branch
 
       ui.msg "All validation steps have passed, making changes..."
       set_new_cb_version
       commit_new_cb_version
-      tag_new_cb_version
+      tag_new_cb_version(get_tag_string)
 
       if config[:git_push]
         git_push_commits
@@ -180,6 +190,7 @@ module KnifeCommunity
       if @version.nil?
         @version = @cb_version.bump(:tiny)
         ui.msg "No version was specified, the new version will be #{@version}"
+        return @version
       end
       if @cb_version >= @version
         ui.error "The current version, #{@cb_version} is either greater or equal to the new version, #{@version}"
@@ -189,10 +200,10 @@ module KnifeCommunity
     end
 
     # Ensure that there isn't already a git tag for this version.
-    def validate_no_existing_tag
+    def validate_no_existing_tag(tag_string)
       existing_tags = Array.new
       @gitrepo.tags.each { |tag| existing_tags << tag.name }
-      if existing_tags.include?(@version.to_s)
+      if existing_tags.include?(tag_string)
         ui.error "This version tag has already been committed to the repo."
         ui.error "Are you sure you haven't released this already?"
         exit 6
@@ -226,8 +237,13 @@ module KnifeCommunity
       @gitrepo.commit_index("release v#{@version}")
     end
 
-    def tag_new_cb_version
-      shellout("git tag -a -m 'release v#{@version}' #{@version}")
+    # Returns the desired tag string, based on config option
+    def get_tag_string
+      config[:tag_prefix] ? "#{config[:tag_prefix]}#{@version.to_s}" : @version.to_s
+    end
+
+    def tag_new_cb_version(tag_string)
+      shellout("git tag -a -m 'release v#{@version}' #{tag_string}")
     end
 
     # Apparently Grit does not have any `push` semantics yet.

data/lib/knife-community/version.rb

@@ -1,3 +1,3 @@
 module KnifeCommunity
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/spec/community_spec.rb

@@ -0,0 +1,41 @@
+require 'spec_helper'
+
+# # Here we expose any proviate methods that we want tested
+# # There may be other ways to do this, I'm no rspec expert
+class KnifeCommunity::CommunityRelease
+  public :get_tag_string
+end
+
+describe KnifeCommunity::CommunityRelease do
+
+  describe "options" do
+
+    before(:each) do
+      @runner = KnifeCommunity::CommunityRelease.new
+      @runner.name_args = ["apache2", "0.1.0"]
+      @runner.setup
+    end
+
+    describe "version string handling" do
+      it "should use the provided version string" do
+        @runner.setup[1].to_s.should == "0.1.0"
+      end
+    end
+
+    describe "version tag prefix handling" do
+      it "should not prepend the tagprefix when not provided" do
+        @runner.get_tag_string.should == "0.1.0"
+      end
+      it "should not prepend tagprefix when none specified" do
+        @runner.options[:tag_prefix] = nil
+        @runner.get_tag_string.should == "0.1.0"
+      end
+      it "should prepend the tagprefix when provided" do
+        @runner.config[:tag_prefix] = "v"
+        @runner.get_tag_string.should == "v0.1.0"
+      end
+    end
+
+  end
+
+end

data/spec/spec_helper.rb

@@ -1,2 +1,17 @@
 require 'rspec'
+# Load any custom matchers
+Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each { |f| require f }
+
 require 'chef/knife/community_release'
+
+# everything from KnifeCommunity::CommunityRelease#deps here as well
+# FIXME: Why do I have to re-require everything?
+require 'knife-community/version'
+require 'mixlib/shellout'
+require 'chef/config'
+require 'chef/cookbook_loader'
+require 'chef/knife/cookbook_site_share'
+require 'chef/cookbook_site_streaming_uploader'
+require 'grit'
+require 'versionomy'
+require 'json'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-community
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-01 00:00:00.000000000 Z
+date: 2013-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -198,6 +198,7 @@ files:
 - knife-community.gemspec
 - lib/chef/knife/community_release.rb
 - lib/knife-community/version.rb
+- spec/community_spec.rb
 - spec/spec_helper.rb
 homepage: http://miketheman.github.com/knife-community
 licenses: []
@@ -219,7 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2561771346968209415
+      hash: -2471496466825284524
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -230,4 +231,5 @@ summary: A Knife plugin to assist with deploying completed Chef cookbooks to the
 test_files:
 - features/cli.feature
 - features/support/env.rb
+- spec/community_spec.rb
 - spec/spec_helper.rb