knife-changelog 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bbd51d2aca135fbd9769d8daf1dd01a7eb59f57
-  data.tar.gz: 7ae04bda29b8e5d5df002a8a325bffbe24de36b9
+  metadata.gz: 34152ac50aad8ec013bfbd082912c1fb3f4dd69b
+  data.tar.gz: 2b7628639511e0b1f6b2ea5209ae41e26695d28f
 SHA512:
-  metadata.gz: 8318f3899126b60f785c8688450f51301e5520e468baf93dfa5492b21700a3822bccd8947be6c0f7a3756b11faea674240598b49c65a62d415f20fa79fa19bc5
-  data.tar.gz: 1089434a0c3335385a7ae2c0d14d5bf01161500560949d08f44c6f5f002c56644d186922ca594bebe9d4f3f3e3037e2b2bb4a028d38d0215157317b49ad9c688
+  metadata.gz: 16ee8cd9af20fc1a9b15f498314ccdee066591eca64a30b66cac25486b49350dad72b95479ffb8b7767401ec745bb71faaf161d1b7de2bd073976a0773d0c334
+  data.tar.gz: 051449529d72c8223eeefd7d3798b3e4aeab3165c4a4a49bf471a02af6468343327726bc6c35d56fb4d9a4a419a19195de451e2e894d2579b93416db97d2e7be

data/lib/chef/knife/changelog.rb

@@ -102,7 +102,7 @@ class Chef
         when /github.com\/(.*)(.git)?/
           options = {
             :github => $1,
-            :revision => 'v' + version_for(name),
+            :revision => version_for(name),
           }
           location = Berkshelf::GithubLocation.new dep, options
           handle_git(location)
@@ -111,11 +111,28 @@ class Chef
         end
       end
 
+      def revision_exists?(dir, revision)
+        Log.debug "Testing existence of #{revision}"
+        revlist = Mixlib::ShellOut.new("git rev-list --quiet #{revision}", :cwd => dir)
+        revlist.run_command
+        not revlist.error?
+      end
+
+      def detect_cur_revision(dir, rev)
+        unless revision_exists?(dir, rev)
+          prefixed_rev = 'v' + rev
+          return prefixed_rev if revision_exists?(dir, prefixed_rev)
+          fail "#{rev} is not a valid revision"
+        end
+        rev
+      end
+
       def handle_git(location)
         tmp_dir = shallow_clone(@tmp_prefix,location.uri)
 
         rev_parse = location.instance_variable_get(:@rev_parse)
         cur_rev = location.revision.rstrip
+        cur_rev = detect_cur_revision(tmp_dir, cur_rev)
         ls_tree = Mixlib::ShellOut.new("git ls-tree -r #{rev_parse}", :cwd => tmp_dir)
         ls_tree.run_command
         changelog = ls_tree.stdout.lines.find { |line| line =~ /\s(changelog.*$)/i }

data/lib/knife/changelog/version.rb

@@ -1,5 +1,5 @@
 module Knife
   module Changelog
-    VERSION = "0.0.6"
+    VERSION = "0.0.7"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-changelog
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Gregoire Seux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-23 00:00:00.000000000 Z
+date: 2015-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler