knife-cookbook-bump 0.0.1

data/.gitignore

@@ -0,0 +1,4 @@
+*.gem
+.bundle
+Gemfile.lock
+pkg/*

data/Gemfile

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in knife-cookbook-bump.gemspec
+gemspec

data/README.md

@@ -0,0 +1,76 @@
+Knife (Cookbook) Bump
+=====================
+
+Knife bump is a knife plugin designed to simplify a cookbook development workflow where cookbooks map onto git repositories.
+
+Rationale
+=========
+
+For any infrastructure developer who works with more than one Opscode Hosted Chef Organization, or has more than one Chef Server (perhaps mapping to a different project, client, or job), the mainstream cookbook development pattern of using the Ospcode Community site, perhaps augmented by your own or third party cookbooks in your Chef repository, doesn't scale very well.  Cookbooks are code - it makes sense to encourage code resuse wherever possible, and bug fixes and enhancements to cookbooks used on one project/organization ought to benefit other organizations.  This proves to be trickier than it sounds, when eeping a collection of dozens of these cookbooks.  These cookbooks are likely to be used in lots of different combinations for different projects/organizations,  requiring a great deal of flexibility.
+
+Managing versioning of this code with a single project is made easy because of the versioning and constraining system that Chef server allows.  We can upload every new version to the Chef server, and constrain which versions are used by employing Chef Environments.  When working with multiple organizations or project, trying to use the Chef server as the authoritative source of versioned cookbooks would require all orgs to have all cookbooks - and every time a change was made, the cookbook(s) being pushed to all orgs/servers.  No, the canonical source of versioning needs to be the version control system in which the cookbook resides.  The normal pattern for cookbooks is to keep them within a Chef repository.  However, Git makes it difficult to tag and branch based on subdirectories.  If I have a single repository, and I make a change to the mongodb cookbook, and increment its version in the metadata, and tag that commit, I will be able to pull the commit again in the future.  Unfortunately, even with the advent of sparse checkouts, I can't really checkout just that directory for just that repository.  The situation becomes much more complicated when we try to scale this over a large number of cookbooks.  Suppose for client A I want mongodb-1.0.1, nginx-1.1.2 and mysql-1.2.6, I can't guarantee that I can find a place in the commit history where all three cookbooks were at the correct version.  I'd need to clone the repo (perhaps sparsely) three times.  Rarely does a project use as few as three cookbooks, so it's apparent that this isn't an elegant solution.  It turns out that, on considersation, the best way to guarantee the degree of flexibility required to work with multiple clients and multiple cookbooks and versions, the best model is to have one git repo per cookbook.
+
+Workflow
+========
+
+The idea of having dozens of cookbook repositories sounds initially clumsy and inelegant, but it's actually a very effective strategy.  We want the following
+
+* A centralised, versioned history of all fixes and improvements for a given cookbook
+* To reinforce the idea of modularity - cookbooks should solve problems in one domain, and should ship the documentation and support code to achieve this in one place
+* To improve the shareability of cookbooks, both between projects and organizations, and within the broader Chef community.  Mapping cookbooks onto Git repositories opens up the same collaborative benefits of Github and similar tools to all infrastructure developers
+
+In order to make the idea workable, it's important to develop a reliable and repeatable workflow which describes the lifecycle of cookbook development.  The following has been tested by Atalanta Systems across a number of clients and technology platforms, and represents a proven approach upon which to base such a workflow:
+
+* Create a git repository for every cookbook you're going to develop on or contribute to.
+* If you're using one of the cookbooks already residing in a dedicated repository, simply fork it as any other software project
+* If you wish to use the Opscode community cookbooks as a starting point, either download the cookbook from the community site using knife, or a browser, or pull the code from the opscode/cookbooks Github repository.  Be aware the Opscode cookbooks repo is fast-moving and in the spirit of Debian Sid could well be in an unstable state - if it breaks, you get to keep the pieces.
+* As you add features or fix bugs, when you're satisfied with your code, increment the version in the cookbook metadata and README and tag the repository with the same name, then push your changes and your tags to Github or your Git server.
+* Curating disparate cookbooks into a meaningful whole can be done manually, but a powerful approach is to use `librarian-chef`, which introduces the concept of a Cheffile, modelled after Ruby's bundler.  A Cheffile simply describes the cookbooks needed for the organization/project, the location of the source code, and any version constraints.  `librarian-chef` also attempts to solve dependencies based on cookbook metadata.  See https://github.com/applicationsonline/librarian for more information.
+* Testing cookbooks and guaranteeing stability for production can be achieved using Chef Environments.  Create an environment called `stable`, and use cookbook version constraints and freezing to provide certainty around the use of known-good and tested cookbooks.  Create one or more `unstable` environments to explore and develop cookbooks and their dependencies.  Bootstrap nodes into stable or unstable environments depending on whether you want to experiment and develop, or provide a repeatable and guaranteed set of cookbooks.
+
+Usage
+=====
+
+Knife bump is designed to automate as much of the workflow described above.  At present, the following functionality is supported:
+
+* Bumping of cookbook metadata
+* Tagging of cookbook git repositories
+
+Knife bump is not yet packaged as a Rubygem, so for now, you can just drop the main code, lib/cookbook-bump/bump.rb in your plugins/knife directory, and knife will find it.  It has a dependency on the `grit` gem to provide object-oriented access to Git repositories.
+
+Bumping
+-------
+
+Cookbooks follow a simple three level versioning pattern.  Knife bump allows the patch, minor or major version to be bumped, and will automatically update the version in the metadata.
+
+    $ knife cookbook create netscape
+    ** Creating cookbook netscape
+    ** Creating README for cookbook: netscape
+    ** Creating metadata for cookbook: netscape
+    $ knife bump netscape patch
+    Bumping patch level of the netscape cookbook from 0.0.1 to 0.0.2
+    $ grep version cookbooks/netscape/metadata.rb 
+    version          "0.0.2"
+    $ knife bump netscape minor
+    Bumping minor level of the netscape cookbook from 0.0.2 to 0.1.2
+    $ grep version cookbooks/netscape/metadata.rb 
+    version          "0.1.2"
+
+Tagging
+-------
+
+*In development*
+
+Supplying the --tag option will additionally tag the git repository corresponding to the cookbook you're working on.  Knife bump attempts to find this repository intelligently, but will ask for confirmation before tagging.  It will also warn you if it thinks the name of the repository it found doesn't sound like a plausible name for the cookbook.
+
+
+Tests
+-----
+
+The core functionality is tested using rspec.  The plugin mechanics are assumed to have been tested by Opscode.
+
+Changes/Roadmap
+---------------
+
+No formal release yet.
+

data/Rakefile

@@ -0,0 +1 @@
+require "bundler/gem_tasks"

data/knife-cookbook-bump.gemspec

@@ -0,0 +1,25 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "cookbook-bump/version"
+
+Gem::Specification.new do |s|
+  s.name        = "knife-cookbook-bump"
+  s.version     = Knife::Cookbook::Bump::VERSION
+  s.authors     = ["Stephen Nelson-Smith", "Fletcher Nichol"]
+  s.email       = ["support@atalanta-systems.com"]
+  s.homepage    = "https://github.com/Atalanta/knife-cookbook-bump"
+  s.summary     = %q{A Chef knife plugin designed to simplify a cookbook development workflow where cookbooks map onto git repositories.}
+  s.description = s.summary
+
+  s.rubyforge_project = "knife-cookbook-bump"
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+
+  s.add_development_dependency "rspec"
+
+  s.add_runtime_dependency "chef"
+  s.add_runtime_dependency "grit"
+end

data/lib/cookbook-bump.rb

@@ -0,0 +1 @@
+require 'cookbook-bump/bump'

data/lib/cookbook-bump/bump.rb

@@ -0,0 +1,102 @@
+require 'chef/knife'
+require 'chef/cookbook_loader'
+require 'chef/cookbook_uploader'
+require 'grit'
+
+module CookbookBump
+  class Bump < Chef::Knife
+
+    TYPE_INDEX = { "major" => 0, "minor" => 1, "patch" => 2 }
+
+    banner "knife bump COOKBOOK [MAJOR|MINOR|PATCH]"
+
+
+    def run
+  
+      self.config = Chef::Config.merge!(config)
+      if config.has_key?(:cookbook_path)
+        cookbook_path = config["cookbook_path"]
+      else
+        ui.fatal "No default cookbook_path; Specify with -o or fix your knife.rb."
+        show_usage
+        exit 1
+      end
+      
+      if name_args.size == 0
+        show_usage
+        exit 0
+      end
+
+      unless name_args.size == 2
+        ui.fatal "Please specify the cookbook whose version you which to bump, and the type of bump you wish to apply."
+        show_usage
+        exit 1
+      end
+    
+      unless TYPE_INDEX.has_key?(name_args.last.downcase)
+        ui.fatal "Sorry, '#{name_args.last}' isn't a valid bump type.  Specify one of 'major', 'minor' or 'patch'"
+        show_usage
+        exit 1
+      end
+      cookbook = name_args.first
+      patch_type = name_args.last
+      cookbook_path = Array(config[:cookbook_path]).first
+
+      patch(cookbook_path, cookbook, patch_type)
+
+    end
+
+
+    def patch(cookbook_path, cookbook, type)
+      t = TYPE_INDEX[type]
+      current_version = get_version(cookbook_path, cookbook).split(".").map{|i| i.to_i}
+      bumped_version = current_version.clone
+      bumped_version[t] = bumped_version[t] + 1
+      metadata_file = File.join(cookbook_path, cookbook, "metadata.rb")
+      old_version = current_version.join('.')
+      new_version = bumped_version.join('.') 
+      update_metadata(old_version, new_version, metadata_file)
+      ui.msg("Bumping #{type} level of the #{cookbook} cookbook from #{old_version} to #{new_version}")
+    end
+
+    def update_metadata(old_version, new_version, metadata_file)
+      open_file = File.open(metadata_file, "r")
+      body_of_file = open_file.read
+      open_file.close
+      body_of_file.gsub!(old_version, new_version)
+      File.open(metadata_file, "w") { |file| file << body_of_file }
+    end
+    
+    def get_version(cookbook_path, cookbook)
+      loader = ::Chef::CookbookLoader.new(cookbook_path)
+      return loader[cookbook].version
+    end
+
+    def get_tags(cookbook_path, cookbook)
+      git_repo = find_git_repo(cookbook_path, cookbook)
+      g = Grit::Repo.new(git_repo)
+      if g.config["remote.origin.url"].split(File::SEPARATOR).last.scan(cookbook).size > 0
+        ui.confirm("I found a repo at #{git_repo} - do you want to tag it?")
+      else
+        ui.confirm("I didn't find a repo with a name like #{cookbook}.  I did find #{git_repo} - are you sure you want to tag it?")
+      end
+      g.tags.map { |t| t.name }
+    end
+
+    def tag
+    end
+
+    def find_git_repo(cookbook_path, cookbook)
+      loader = ::Chef::CookbookLoader.new(cookbook_path)
+      cookbook_dir = loader[cookbook].root_dir
+      full_path = cookbook_dir.split(File::SEPARATOR)
+      (full_path.length - 1).downto(0) do |search_path_index|
+        git_config = File.join(full_path[0..search_path_index] + [".git", "config"])
+        if File.exist?(git_config)
+          return File.join(full_path[0..search_path_index])
+        end
+      end
+      ui.fatal("Unable to find a git repo for this cookbook.")
+    end
+  end
+end

data/lib/cookbook-bump/version.rb

@@ -0,0 +1,7 @@
+module Knife
+  module Cookbook
+    module Bump
+      VERSION = "0.0.1"
+    end
+  end
+end

data/spec/cookbook-bump/bump.spec

@@ -0,0 +1,72 @@
+require 'spec_helper'
+
+module CookbookBump
+
+  describe Bump do
+    before(:all) do
+      bare_repo_dir = File.join(File.dirname(__FILE__), 'origin_example_cookbook.git')
+      clone_repo_dir = File.join(File.dirname(__FILE__), 'example_cookbook2')
+
+      FileUtils.mkdir_p(bare_repo_dir)
+      g = Grit::Repo.init_bare(bare_repo_dir)
+      git_cloner = Grit::Git.new(clone_repo_dir)
+      git_cloner.clone({:quiet => false, :verbose => true, :progress => true, :branch => 'master'}, bare_repo_dir, clone_repo_dir)
+    end
+
+    before :all do
+      @bumper = Bump.new
+      @bumper.ui = Chef::Knife::UI.new(StringIO.new, StringIO.new, StringIO.new, {})
+      @cookbook_path = File.dirname(__FILE__)
+      @index = { "major" => 0, "minor" => 1, "patch" => 2 }
+    end
+
+    describe "patch" do
+      it "should increment the cookbook patch level in the metadata by one" do
+        original_version = @bumper.get_version(@cookbook_path, "example_cookbook")
+        original_patch_level = original_version.split('.')[@index["patch"]].to_i
+        @bumper.patch(@cookbook_path, "example_cookbook", "patch")
+        bumped_version = @bumper.get_version(@cookbook_path, "example_cookbook")
+        bumped_patch_level = bumped_version.split('.')[@index["patch"]].to_i
+        result = bumped_patch_level - original_patch_level
+        result.should eq(1)
+      end
+    end
+
+    describe "minor" do
+      it "should increment the cookbook minor level in the metadata by one" do
+        original_version = @bumper.get_version(@cookbook_path, "example_cookbook")
+        original_patch_level = original_version.split('.')[@index["minor"]].to_i
+        @bumper.patch(@cookbook_path, "example_cookbook", "minor")
+        bumped_version = @bumper.get_version(@cookbook_path, "example_cookbook")
+        bumped_patch_level = bumped_version.split('.')[@index["minor"]].to_i
+        result = bumped_patch_level - original_patch_level
+        result.should eq(1)
+      end
+    end
+
+    describe "major" do
+      it "should increment the cookbook minor level in the metadata by one" do
+        original_version = @bumper.get_version(@cookbook_path, "example_cookbook")
+        original_patch_level = original_version.split('.')[@index["major"]].to_i
+        @bumper.patch(@cookbook_path, "example_cookbook", "major")
+        bumped_version = @bumper.get_version(@cookbook_path, "example_cookbook")
+        bumped_patch_level = bumped_version.split('.')[@index["major"]].to_i
+        result = bumped_patch_level - original_patch_level
+        result.should eq(1)
+      end
+    end
+
+    describe "tag" do
+      it "should tag the git repository in which the cookbook resides with the bumped version number" do
+        existing_tags = @bumper.get_tags(@cookbook_path, "example_cookbook")
+        @bumper.patch(@cookbook_path, "example_cookbook", "patch")
+        latest_version =  @bumper.get_version(@cookbook_path, "example_cookbook")
+        @bumper.tag
+        latest_tags = @bumper.get_tags(@cookbook_path, "example_cookbook")
+        new_tag = latest_tags - existing_tags
+        new_tag.should eq(latest_version)
+      end
+    end
+
+  end
+end

data/spec/cookbook-bump/example_cookbook/metadata.rb

@@ -0,0 +1,6 @@
+maintainer       "Atalanta Systems Ltd"
+maintainer_email "support@atalanta-systems.com"
+license          "Apache 2.0"
+description      "Example cookbook metadata file"
+long_description "Long version"
+version          "0.0.0"

data/spec/spec_helper.rb

@@ -0,0 +1,4 @@
+require 'chef/knife'
+require 'cookbook-bump'
+require 'grit'
+

metadata

@@ -0,0 +1,92 @@
+--- !ruby/object:Gem::Specification
+name: knife-cookbook-bump
+version: !ruby/object:Gem::Version
+  version: 0.0.1
+  prerelease: 
+platform: ruby
+authors:
+- Stephen Nelson-Smith
+- Fletcher Nichol
+autorequire: 
+bindir: bin
+cert_chain: []
+date: 2011-10-30 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &69759060 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *69759060
+- !ruby/object:Gem::Dependency
+  name: chef
+  requirement: &69758790 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *69758790
+- !ruby/object:Gem::Dependency
+  name: grit
+  requirement: &69758580 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *69758580
+description: A Chef knife plugin designed to simplify a cookbook development workflow
+  where cookbooks map onto git repositories.
+email:
+- support@atalanta-systems.com
+executables: []
+extensions: []
+extra_rdoc_files: []
+files:
+- .gitignore
+- Gemfile
+- README.md
+- Rakefile
+- knife-cookbook-bump.gemspec
+- lib/cookbook-bump.rb
+- lib/cookbook-bump/bump.rb
+- lib/cookbook-bump/version.rb
+- spec/cookbook-bump/bump.spec
+- spec/cookbook-bump/example_cookbook/metadata.rb
+- spec/spec_helper.rb
+homepage: https://github.com/Atalanta/knife-cookbook-bump
+licenses: []
+post_install_message: 
+rdoc_options: []
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements: []
+rubyforge_project: knife-cookbook-bump
+rubygems_version: 1.8.10
+signing_key: 
+specification_version: 3
+summary: A Chef knife plugin designed to simplify a cookbook development workflow
+  where cookbooks map onto git repositories.
+test_files: []