knife-community 0.0.1 → 0.1.0

data/.gitignore

@@ -19,3 +19,5 @@ doc/
 
 Gemfile.lock
 .rvmrc
+
+bin/

data/.travis.yml

@@ -2,7 +2,10 @@ language: ruby
 rvm:
   - 1.9.2
   - 1.9.3
+bundler_args: --without=localdev
 env:
-  - CHEF_VERSION=0.10.8
-  - CHEF_VERSION=10.12.0
-  - CHEF_VERSION=10.14.2
+  - CHEF_VERSION=10.20.0
+  - CHEF_VERSION=10.22.0
+  - CHEF_VERSION=10.24.0
+  - CHEF_VERSION=11.2.0
+  - CHEF_VERSION=11.4.0

data/CHANGELOG.md

@@ -0,0 +1,11 @@
+
+# v0.1.0 - February 26, 2013
+
+- BugFix: Dropped a bunch older Chef versions due to a JSON dependency nightmare, passes tests
+- Enhancement: Moved to a better SemVer version number, to reflect features vs patches
+- Enhancement: Added mods from @schisamo, user flags for git push and share, preserves default behavior
+- **NOTE**: a user prompt has been added to the community release. Use `-y` to bypass
+
+# v0.0.1 - September 17, 2012
+
+- Initial version, does a lot of the "heavy lifting" and accomplishes the task

data/Gemfile

@@ -1,4 +1,11 @@
 source 'https://rubygems.org'
 
+# These will not be used in travis builds, as they are more human-developer oriented
+group :localdev do
+  gem 'travis-lint', '~> 1.4'
+  gem 'guard-rspec', '~> 2.4'
+  gem 'guard-cucumber', '~> 1.2'
+end
+
 # Specify your gem's dependencies in knife-community.gemspec
 gemspec

data/README.md

@@ -70,12 +70,15 @@ Flags
 
     This is a flow that some adopt by having even-only numbered releases, utilizing the [odd numbered ones for development][wiki:oddver].
 
+There are other flags, run `knife community release -h` to see their specifications.
 
 Some good ideas while working on a cookbook
 -------------------------------------------
 
 Creating a `CHANGELOG.md` that details a short message about any changes included in each release is really helpful to anyone looking at your updated cookbook and seeing if it addresses a problem they have, without delving deeper into the code.
 
+See the CHANGELOG for this project to get an idea of how to write one.
+
 Updating a `TODO.md` file if there are outstanding known issues, planned work for the next version, etc. A TODO file also helps anyone else in the community try to tackle a problem you haven't figured out or gotten to yet, so they can issue a pull request for your cookbook.
 
 Follow [Semantic Versioning][semver] when choosing which version number to increment to. Start your cookbook at 0.1.0, and increment from there, until you are confident enough in a 1.0.0 version.

data/Rakefile

@@ -1,13 +1,14 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
 
-task :default => [:features]
+task :default => [:features, :tailor]
 
 # https://github.com/turboladen/tailor
 require 'tailor/rake_task'
 Tailor::RakeTask.new do |task|
-  task.file_set('lib/**/*.rb', 'code') do |style|
+  task.file_set 'lib/**/*.rb', :code do |style|
     style.max_line_length 160, level: :warn
+    style.max_code_lines_in_method 40, level: :warn
   end
 end
 

data/features/support/env.rb

@@ -1,12 +1,11 @@
 # Set up the environment for testing
 require 'aruba/cucumber'
-# require 'aruba-doubles/cucumber'
 
-# Before do
-#   @dirs = ["tmp/aruba"]
-# end
+Before do
+  @aruba_timeout_seconds = 5
+end
 
-After do |s| 
+After do |s|
   # Tell Cucumber to quit after this scenario is done - if it failed.
   # This is useful to inspect the 'tmp/aruba' directory before any other
   # steps are executed and clear it out.

data/knife-community.gemspec

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-chef_version = ENV.key?('CHEF_VERSION') ? "= #{ENV['CHEF_VERSION']}" : ['~> 10']
+chef_version = ENV.key?('CHEF_VERSION') ? "= #{ENV['CHEF_VERSION']}" : ['>= 10', '<= 12']
 require File.expand_path('../lib/knife-community/version', __FILE__)
 
 Gem::Specification.new do |gem|
@@ -27,15 +27,12 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = '>= 1.9.2'
 
-  gem.add_development_dependency 'rake', '~> 0.9'
-  gem.add_development_dependency 'rspec', '~> 2.11.0'
-  gem.add_development_dependency 'cucumber', '~> 1'
   gem.add_development_dependency 'aruba', '~> 0.4'
-  gem.add_development_dependency 'tailor', '~> 1.1'
-  gem.add_development_dependency 'travis-lint', '~> 1.4'
-  gem.add_development_dependency 'guard', '~> 1.3'
-  gem.add_development_dependency 'guard-rspec', '~> 1.2'
-  gem.add_development_dependency 'guard-cucumber', '~> 1.2'
+  gem.add_development_dependency 'cucumber', '~> 1'
+  gem.add_development_dependency 'guard', '~> 1.6'
+  gem.add_development_dependency 'rake', '~> 10'
+  gem.add_development_dependency 'rspec', '~> 2.11'
+  gem.add_development_dependency 'tailor', '= 1.1.3' # See https://github.com/turboladen/tailor/issues/129
 
   gem.authors       = ["Mike Fiedler"]
   gem.email         = ["miketheman@gmail.com"]

data/lib/chef/knife/community_release.rb

@@ -40,6 +40,18 @@ module KnifeCommunity
       :boolean => true,
       :description => "Odd-numbered development cycle. Bump minor version & commit for development"
 
+    option :git_push,
+      :long => "--[no-]git-push",
+      :boolean => true,
+      :default => true,
+      :description => "Indicates whether the commits and tags should be pushed to pushed to the default git remote."
+
+    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
       self.config = Chef::Config.merge!(config)
       validate_args
@@ -59,13 +71,21 @@ module KnifeCommunity
       set_new_cb_version
       commit_new_cb_version
       tag_new_cb_version
-      git_push_commits
-      git_push_tags
 
-      share_new_version
+      if config[:git_push]
+        git_push_commits
+        git_push_tags
+      end
 
-      ui.msg "Version #{@version} of the #{@cb_name} has been released!"
-      ui.msg "Check it out at http://ckbk.it/#{@cb_name}"
+      if config[:site_share]
+        confirm_share_msg  = "Shall I release version #{@version} of the"
+        confirm_share_msg << " #{@cb_name} cookbook to the community site? (Y/N) "
+        if config[:yes] || (ask_question(confirm_share_msg).chomp.upcase == "Y")
+          share_new_version
+          ui.msg "Version #{@version} of the #{@cb_name} cookbook has been released!"
+          ui.msg "Check it out at http://ckbk.it/#{@cb_name}"
+        end
+      end
 
       # @TODO: Increment the current version to the next available odd number
       # algo = n + 1 + (n % 2)

data/lib/knife-community/version.rb

@@ -1,3 +1,3 @@
 module KnifeCommunity
-  VERSION = "0.0.1"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-community
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,30 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-17 00:00:00.000000000 Z
+date: 2013-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '10'
+    - - <=
+      - !ruby/object:Gem::Version
+        version: '12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '10'
+    - - <=
+      - !ruby/object:Gem::Version
+        version: '12'
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
   requirement: !ruby/object:Gem::Requirement
@@ -75,54 +81,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.4'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.11.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.11.0
-- !ruby/object:Gem::Dependency
-  name: cucumber
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
@@ -140,13 +98,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.4'
 - !ruby/object:Gem::Dependency
-  name: tailor
+  name: cucumber
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -154,15 +112,15 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1'
 - !ruby/object:Gem::Dependency
-  name: travis-lint
+  name: guard
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -170,15 +128,15 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: guard
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -186,15 +144,15 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '10'
 - !ruby/object:Gem::Dependency
-  name: guard-rspec
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -202,23 +160,23 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.11'
 - !ruby/object:Gem::Dependency
-  name: guard-cucumber
+  name: tailor
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.1.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.1.3
 description: The centralized location for sharing cookbooks is the Community Site,
   this is a process helper to produce a repeatable method for releasing cookbooks.
 email:
@@ -229,6 +187,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .travis.yml
+- CHANGELOG.md
 - Gemfile
 - Guardfile
 - LICENSE
@@ -260,10 +219,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1152703589745345809
+      hash: -2662573135951615840
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: A Knife plugin to assist with deploying completed Chef cookbooks to the Community