kitchen-scribe 0.3.0 → 0.3.1

data/.gitignore

@@ -1 +1,3 @@
-.chef
+.chef
+Gemfile.lock
+gemfiles/*.lock

data/.ruby-gemset

@@ -0,0 +1 @@
+kitchen-scribe

data/.ruby-version

@@ -0,0 +1 @@
+ruby-1.9.3-p327

data/.travis.yml

@@ -0,0 +1,13 @@
+language: ruby
+rvm:
+  - "1.9.2"
+  - "1.9.3"
+  - "2.0.0"
+gemfile:
+  - gemfiles/Gemfile.chef-11
+  - gemfiles/Gemfile.chef-10
+matrix:
+  exclude:
+    - rvm: 2.0.0
+      gemfile: gemfiles/Gemfile.chef-10
+script: bundle exec rspec spec

data/CHANGELOG.md

@@ -0,0 +1,19 @@
+## 0.3.0
+
+Bugfixes:
+
+* Adjusting a node was overwriting normal attributes and erasing automatic attributes set by ohai. This is no longer the case.
+* Updated all adjustment templates
+* Changed the name for node attributes stored by scribe copy to `normal` to make loading configurations from chronicle backups more convinient
+
+## 0.2.0
+
+Features:
+
+* Added `scribe hire` for making precise updates to environments, roles and nodes by using json data structure describing the change.
+
+## 0.1.0
+
+Features:
+
+* First edition of `scribe` with a single directive called `copy`. It pulls the configuration of all your environements, roles, and nodes then saves them into json files in the place of your choosing and commits the changes to a local git repository. It can also pull/push them to a remote repostory for safekeeping. 

data/Gemfile

@@ -1,5 +1,3 @@
-source :rubygems
+source 'https://rubygems.org'
 
-gem "chef"
-gem "rspec"
-gem "kitchen-scribe"
+gemspec

data/README.md

@@ -17,8 +17,10 @@ The philosophy behind using scribe to update your environments, roles an nodes i
 
 The plugin is still in the beta stage, I've tested it manualy to some extent, but I'm sure there are things I missed. Please submit any bugs you find through the github issue system and I promiss to take care of them as soon as possible.
 
-[![Code Climate](https://codeclimate.com/github/khozlov/kitchen-scribe.png)](https://codeclimate.com/github/khozlov/kitchen-scribe)
 [![Gem Version](https://badge.fury.io/rb/kitchen-scribe.png)](http://badge.fury.io/rb/kitchen-scribe)
+[![Build Status](https://travis-ci.org/khozlov/kitchen-scribe.png?branch=master)](https://travis-ci.org/khozlov/kitchen-scribe)
+[![Dependency Status](https://gemnasium.com/khozlov/kitchen-scribe.png)](https://gemnasium.com/khozlov/kitchen-scribe)
+[![Code Climate](https://codeclimate.com/github/khozlov/kitchen-scribe.png)](https://codeclimate.com/github/khozlov/kitchen-scribe)
 
 USAGE
 -----
@@ -51,6 +53,8 @@ You can also specify all the params in your `knife.rb` not to type it in every t
                        :commit_message => "your_commit_message"
                      }
 
+At this moment, when using ruby 1.8.7 or earlier the diff between subsequent revisions might be inaccurate due to non-deterministic hash ordering in versions prior to 1.9. I'll try to fix it in future releases.  
+
 ### Making Changes
 
 `adjust` action is your friend here.
@@ -116,8 +120,7 @@ Have fun!
 WHAT'S NEXT
 -----------
 * Refactoring, refactoring, refactoring
-* Testing
-* Bug fixes
+* Ruby 1.8.7 fix
 
 LICENSE
 -------

data/gemfiles/Gemfile.chef-10

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem "chef", '~> 10.0'
+
+gemspec :path => '..'

data/gemfiles/Gemfile.chef-11

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem "chef", '~> 11.2'
+
+gemspec :path => '..'

data/kitchen-scribe.gemspec

@@ -12,6 +12,7 @@ Gem::Specification.new do |s|
   s.summary = "Knife plugin for tracking your chef configuration changes"
   s.description = s.summary
   s.extra_rdoc_files = ["README.md", "LICENSE" ]
+  s.license = "Apache License (2.0)"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/chef/knife/scribe_adjust.rb

@@ -220,7 +220,7 @@ class Chef
       def prepare_object_hash(chef_object)
         prepared_hash = chef_object.to_hash
         if prepared_hash["chef_type"] == "node"
-          prepared_hash.keep_if { |key, value| ["name","chef_type","chef_environment","run_list"].include? key }
+          prepared_hash.reject! { |key, value| !(["name","chef_type","chef_environment","run_list"].include? key) }
           prepared_hash.merge!({ "normal" => chef_object.normal_attrs })
         end
         prepared_hash

data/lib/kitchen-scribe/version.rb

@@ -1,4 +1,4 @@
 module KitchenScribe
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
   MAJOR, MINOR, TINY = VERSION.split('.')
 end

data/spec/chef/knife/scribe_adjust_spec.rb

@@ -133,7 +133,7 @@ describe Chef::Knife::ScribeAdjust do
 
         it "prints errors but does not exit" do
           @scribe.should_receive(:print_errors)
-          lambda { @scribe.parse_adjustments }.should_not raise_error(SystemExit)
+          lambda { @scribe.parse_adjustments }.should_not raise_error()
         end
       end
     end
@@ -535,7 +535,7 @@ describe Chef::Knife::ScribeAdjust do
 
       it "doesn't throw an exception" do
         File.should_receive(:open).with(@filename, "r").and_yield('{"a" : 3, b => ]')
-        lambda { @scribe.parse_adjustment_file(@filename) }.should_not raise_error(JSON::ParserError)
+        lambda { @scribe.parse_adjustment_file(@filename) }.should_not raise_error()
       end
     end
 
@@ -713,7 +713,7 @@ describe Chef::Knife::ScribeAdjust do
         }
         @chef_obj.stub(:to_hash).and_return( @node_data)
         @chef_obj.stub(:normal_attrs).and_return({"nx" => "ny"})
-        @prepared_data = @node_data.select { |key, value| ["name","chef_type","chef_environment","run_list"].include? key }
+        @prepared_data = @node_data.reject { |key, value| !(["name","chef_type","chef_environment","run_list"].include? key) }
         @prepared_data.merge!({"normal" => {"nx" => "ny"}})
       end
 

data/spec/chef/knife/scribe_copy_spec.rb

@@ -434,8 +434,8 @@ describe Chef::Knife::ScribeCopy do
   describe "#deep_sort" do
     describe "when it gets a hash as a parameter" do
       it "sorts the hash" do
-        sorted_hash = @scribe.deep_sort({:c => 3, :a => 1, :x => 0, :d => -2})
-        sorted_values = [[:a, 1], [:c,3], [:d,-2], [:x,0]]
+        sorted_hash = @scribe.deep_sort({"c" => 3, "a" => 1, "x" => 0, "d" => -2})
+        sorted_values = [["a", 1], ["c",3], ["d",-2], ["x",0]]
         i = 0
         sorted_hash.each do |key, value|
           key.should eql(sorted_values[i][0])
@@ -445,7 +445,7 @@ describe Chef::Knife::ScribeCopy do
       end
 
       it "calls itself recursively with each value" do
-        hash_to_sort = {:g => 3, :b => 1, :z => 0, :h => -2}
+        hash_to_sort = {"g" => 3, "b" => 1, "z" => 0, "h" => -2}
         @scribe.should_receive(:deep_sort).with(hash_to_sort).and_call_original
         hash_to_sort.values.each {|value| @scribe.should_receive(:deep_sort).with(value)}
         @scribe.deep_sort(hash_to_sort)

data/spec/chef/knife/scribe_hire_spec.rb

@@ -20,8 +20,8 @@ require File.expand_path('../../../spec_helper', __FILE__)
 
 describe Chef::Knife::ScribeHire do
   before(:each) do
-    Dir.stub!(:mkdir)
-    Dir.stub!(:pwd) { "some_path" }
+    Dir.stub(:mkdir)
+    Dir.stub(:pwd) { "some_path" }
     @scribe = Chef::Knife::ScribeHire.new
     Chef::Config[:knife][:scribe] = {}
     @scribe.configure
@@ -31,7 +31,7 @@ describe Chef::Knife::ScribeHire do
     before(:each) do
       @scribe.stub(:setup_remote)
       @scribe.stub(:init_chronicle)
-      File.stub!(:directory?) { false }
+      File.stub(:directory?) { false }
     end
 
     it "calls #configure" do

data/spec/spec_helper.rb

@@ -22,3 +22,7 @@ require 'chef/knife'
 require 'chef/knife/scribe_hire'
 require 'chef/knife/scribe_copy'
 require 'chef/knife/scribe_adjust'
+require 'chef/role'
+require 'chef/environment'
+require 'chef/node'
+require 'chef/search/query'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-scribe
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-25 00:00:00.000000000 Z
+date: 2013-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -85,11 +85,15 @@ extra_rdoc_files:
 - LICENSE
 files:
 - .gitignore
-- .rvmrc
+- .ruby-gemset
+- .ruby-version
+- .travis.yml
+- CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
+- gemfiles/Gemfile.chef-10
+- gemfiles/Gemfile.chef-11
 - kitchen-scribe.gemspec
 - lib/chef/knife/scribe_adjust.rb
 - lib/chef/knife/scribe_copy.rb
@@ -100,7 +104,8 @@ files:
 - spec/chef/knife/scribe_hire_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/khozlov/kitchen-scribe
-licenses: []
+licenses:
+- Apache License (2.0)
 post_install_message: 
 rdoc_options: []
 require_paths:

data/.rvmrc

@@ -1,34 +0,0 @@
-#!/usr/bin/env bash
-
-# This is an RVM Project .rvmrc file, used to automatically load the ruby
-# development environment upon cd'ing into the directory
-
-# First we specify our desired <ruby>[@<gemset>], the @gemset name is optional,
-# Only full ruby name is supported here, for short names use:
-#     echo "rvm use 1.9.3" > .rvmrc
-environment_id="ruby-1.9.3-p327@kitchen-scribe"
-
-# Uncomment the following lines if you want to verify rvm version per project
-# rvmrc_rvm_version="1.17.3 (stable)" # 1.10.1 seams as a safe start
-# eval "$(echo ${rvm_version}.${rvmrc_rvm_version} | awk -F. '{print "[[ "$1*65536+$2*256+$3" -ge "$4*65536+$5*256+$6" ]]"}' )" || {
-#   echo "This .rvmrc file requires at least RVM ${rvmrc_rvm_version}, aborting loading."
-#   return 1
-# }
-
-# First we attempt to load the desired environment directly from the environment
-# file. This is very fast and efficient compared to running through the entire
-# CLI and selector. If you want feedback on which environment was used then
-# insert the word 'use' after --create as this triggers verbose mode.
-if [[ -d "${rvm_path:-$HOME/.rvm}/environments"
-  && -s "${rvm_path:-$HOME/.rvm}/environments/$environment_id" ]]
-then
-  \. "${rvm_path:-$HOME/.rvm}/environments/$environment_id"
-  [[ -s "${rvm_path:-$HOME/.rvm}/hooks/after_use" ]] &&
-    \. "${rvm_path:-$HOME/.rvm}/hooks/after_use" || true
-else
-  # If the environment file has not yet been created, use the RVM CLI to select.
-  rvm --create  "$environment_id" || {
-    echo "Failed to create RVM environment '${environment_id}'."
-    return 1
-  }
-fi

data/Gemfile.lock

@@ -1,76 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    bunny (0.7.9)
-    chef (10.18.2)
-      bunny (>= 0.6.0, < 0.8.0)
-      erubis
-      highline (>= 1.6.9)
-      json (>= 1.4.4, <= 1.6.1)
-      mixlib-authentication (>= 1.3.0)
-      mixlib-cli (>= 1.1.0)
-      mixlib-config (>= 1.1.2)
-      mixlib-log (>= 1.3.0)
-      mixlib-shellout
-      moneta (< 0.7.0)
-      net-ssh (~> 2.2.2)
-      net-ssh-multi (~> 1.1.0)
-      ohai (>= 0.6.0)
-      rest-client (>= 1.0.4, < 1.7.0)
-      treetop (~> 1.4.9)
-      uuidtools
-      yajl-ruby (~> 1.1)
-    diff-lcs (1.1.3)
-    erubis (2.7.0)
-    highline (1.6.15)
-    ipaddress (0.8.0)
-    json (1.6.1)
-    kitchen-scribe (0.1.0)
-      chef (>= 0.10.10)
-    mime-types (1.19)
-    mixlib-authentication (1.3.0)
-      mixlib-log
-    mixlib-cli (1.3.0)
-    mixlib-config (1.1.2)
-    mixlib-log (1.4.1)
-    mixlib-shellout (1.1.0)
-    moneta (0.6.0)
-    net-ssh (2.2.2)
-    net-ssh-gateway (1.1.0)
-      net-ssh (>= 1.99.1)
-    net-ssh-multi (1.1)
-      net-ssh (>= 2.1.4)
-      net-ssh-gateway (>= 0.99.0)
-    ohai (6.16.0)
-      ipaddress
-      mixlib-cli
-      mixlib-config
-      mixlib-log
-      mixlib-shellout
-      systemu
-      yajl-ruby
-    polyglot (0.3.3)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
-    rspec (2.12.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    rspec-core (2.12.2)
-    rspec-expectations (2.12.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.1)
-    systemu (2.5.2)
-    treetop (1.4.12)
-      polyglot
-      polyglot (>= 0.3.1)
-    uuidtools (2.1.3)
-    yajl-ruby (1.1.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  chef
-  kitchen-scribe
-  rspec