knife-sharp 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ddab4231fc3e426c9a71063a2a417b10b3cae947
-  data.tar.gz: eda6e7ed4b19017b5a386b2550b1cbaac6364a0e
+  metadata.gz: 1883776ced8a7c5cceaf4732195ef8ac9aa52faf
+  data.tar.gz: 7fe5dd589ce02228a9068fc0693dc69bebe57e3d
 SHA512:
-  metadata.gz: 4070ebe2f93b5bbbef1fa1a28652b5988ab76d356cb6383bb20d9646dec145c13c6e8ceecdef8930e8b3581347f50ff66f3f435b7c449283e404f435e02f6a51
-  data.tar.gz: 53dd08f8ad6159fa06096a69f177e57d7da443df3ac607517be1ee6f495dab513eff969c573f114d72e3c351d04a77e0b1fafe55c4090876f8e101b2e1d2fe54
+  metadata.gz: 97bc72e991176812e9b12b73d5ef31a8e3ceec5bf766942e3c344ad311fd3ced8944ce81bff56e357ec75967c2bf718b9bf8174b4fa5f72b0e8aaebe034b8859
+  data.tar.gz: 9ad43019d1ca1cf77f06d264ac0ecae3ab014cc381ad4853576e36e1621da46d463e77b9180b2ec6e3cd151c7aaba4b90c6672eee0972913278f6c9c34c9620f

data/Gemfile

@@ -1 +1,3 @@
+source 'https://rubygems.org'
+
 gemspec

data/Gemfile.lock

@@ -1,17 +1,18 @@
 PATH
   remote: .
   specs:
-    knife-sharp (0.5.0)
+    knife-sharp (0.6.1)
       chef (>= 11)
-      grit (~> 2.5)
 
 GEM
+  remote: https://rubygems.org/
   specs:
-    chef (12.0.3)
-      chef-zero (~> 3.2)
+    builder (3.2.2)
+    chef (12.2.1)
+      chef-zero (~> 4.0)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
-      ffi-yajl (~> 1.2)
+      ffi-yajl (>= 1.2, < 3.0)
       highline (~> 1.6, >= 1.6.9)
       mixlib-authentication (~> 1.3)
       mixlib-cli (~> 1.4)
@@ -23,8 +24,14 @@ GEM
       ohai (~> 8.0)
       plist (~> 3.1.0)
       pry (~> 0.9)
-    chef-zero (3.2.1)
-      ffi-yajl (~> 1.1)
+      rspec-core (~> 3.2)
+      rspec-expectations (~> 3.2)
+      rspec-mocks (~> 3.2)
+      rspec_junit_formatter (~> 0.2.0)
+      serverspec (~> 2.7)
+      specinfra (~> 2.10)
+    chef-zero (4.2.1)
+      ffi-yajl (>= 1.1, < 3.0)
       hashie (~> 2.0)
       mixlib-log (~> 1.3)
       rack
@@ -32,56 +39,80 @@ GEM
     coderay (1.1.0)
     diff-lcs (1.2.5)
     erubis (2.7.0)
-    ffi (1.9.6)
-    ffi-yajl (1.3.1)
+    ffi (1.9.8)
+    ffi-yajl (2.0.0)
       ffi (~> 1.5)
       libyajl2 (~> 1.2)
-    grit (2.5.0)
-      diff-lcs (~> 1.1)
-      mime-types (~> 1.15)
-      posix-spawn (~> 0.3.6)
     hashie (2.1.2)
-    highline (1.6.21)
+    highline (1.7.1)
     ipaddress (0.8.0)
     libyajl2 (1.2.0)
     method_source (0.8.2)
-    mime-types (1.25.1)
+    mime-types (2.4.3)
     mixlib-authentication (1.3.0)
       mixlib-log
     mixlib-cli (1.5.0)
     mixlib-config (2.1.0)
     mixlib-log (1.6.0)
     mixlib-shellout (2.0.1)
-    net-dhcp (1.3.2)
+    multi_json (1.11.0)
+    net-scp (1.2.1)
+      net-ssh (>= 2.6.5)
     net-ssh (2.9.2)
     net-ssh-gateway (1.2.0)
       net-ssh (>= 2.6.5)
-    net-ssh-multi (1.2.0)
+    net-ssh-multi (1.2.1)
       net-ssh (>= 2.6.5)
       net-ssh-gateway (>= 1.2.0)
-    ohai (8.0.1)
+    ohai (8.2.0)
       ffi (~> 1.9)
-      ffi-yajl (~> 1.1)
+      ffi-yajl (>= 1.1, < 3.0)
       ipaddress
-      mime-types (~> 1.16)
+      mime-types (~> 2.0)
       mixlib-cli
       mixlib-config (~> 2.0)
       mixlib-log
       mixlib-shellout (~> 2.0)
-      net-dhcp
       rake (~> 10.1)
       systemu (~> 2.6.4)
       wmi-lite (~> 1.0)
     plist (3.1.0)
-    posix-spawn (0.3.9)
     pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
     rack (1.6.0)
-    rake (10.1.0)
+    rake (10.4.2)
+    rspec (3.2.0)
+      rspec-core (~> 3.2.0)
+      rspec-expectations (~> 3.2.0)
+      rspec-mocks (~> 3.2.0)
+    rspec-core (3.2.3)
+      rspec-support (~> 3.2.0)
+    rspec-expectations (3.2.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
+    rspec-its (1.2.0)
+      rspec-core (>= 3.0.0)
+      rspec-expectations (>= 3.0.0)
+    rspec-mocks (3.2.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
+    rspec-support (3.2.2)
+    rspec_junit_formatter (0.2.0)
+      builder (< 4)
+      rspec (>= 2, < 4)
+      rspec-core (!= 2.12.0)
+    serverspec (2.14.1)
+      multi_json
+      rspec (~> 3.0)
+      rspec-its
+      specinfra (~> 2.25)
     slop (3.6.0)
-    systemu (2.6.4)
+    specinfra (2.28.2)
+      net-scp
+      net-ssh
+    systemu (2.6.5)
     uuidtools (2.1.5)
     wmi-lite (1.0.0)
 

data/README.md

@@ -172,9 +172,6 @@ The activation of this rollback feature and its storage dir can be configured in
 
 # Configuration
 
-Dependencies :
-* grit
-
 The plugin will search in 2 places for its config file :
 * "/etc/sharp-config.yml"
 * "~/.chef/sharp-config.yml"
@@ -192,8 +189,9 @@ environment_path         '/home/jamiez/chef/environments'
 ```
 in knife.rb
 
-## Cookbooks path & git
-If your cookbook_path is not the root of your git directory then the grit gem will produce an error. This can be circumvented by adding the following directive in your config file :
+## Current git branch
+
+knife-sharp will check that the given branch is the active one in the chef repo. Chef repo path has to be specified in sharp-config.yml file:
 
 ```yaml
 global:
@@ -203,6 +201,7 @@ global:
 As we version more than the cookbooks in the repo.
 
 ## Logging
+
 It's good to have things logged. The plugin can do it for you. Add this to your config file
 ```yaml
 logging:

data/knife-sharp.gemspec

@@ -16,5 +16,4 @@ Gem::Specification.new do |s|
   s.require_paths = [ "lib" ]
 
   s.add_dependency "chef", ">= 11"
-  s.add_dependency "grit", "~> 2.5"
 end

data/lib/chef/knife/sharp-align.rb

@@ -1,6 +1,5 @@
 require 'chef/knife'
 require 'knife-sharp/common'
-require 'grit'
 
 module KnifeSharp
   class SharpAlign < Chef::Knife

data/lib/knife-sharp.rb

@@ -1,3 +1,3 @@
 module KnifeSharp
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

data/lib/knife-sharp/common.rb

@@ -23,11 +23,13 @@ module KnifeSharp
       def ensure_correct_branch_provided!
         # Checking current branch
         given_branch = @name_args.first
-        current_branch = Grit::Repo.new(sharp_config["global"]["git_cookbook_path"]).head.name
 
-        if given_branch != current_branch then
-          ui.error "Git repo is actually on branch #{current_branch} but you want to align using #{given_branch}. Checkout to the desired one."
-          exit 1
+        Dir.chdir(sharp_config["global"]["git_cookbook_path"]) do
+          current_branch = %x(git rev-parse --abbrev-ref HEAD).chomp
+          if given_branch != current_branch
+            ui.error "Git repo is actually on branch #{current_branch} but you want to align using #{given_branch}. Checkout to the desired one."
+            exit 1
+          end
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-sharp
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Nicolas Szalay
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-02 00:00:00.000000000 Z
+date: 2015-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -25,20 +25,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '11'
-- !ruby/object:Gem::Dependency
-  name: grit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.5'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.5'
 description: Sharpen your knife
 email:
 - nico@rottenbytes.info