knife-mirror 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e9df5f32eafbd870052b94aaf48203c58bba73d
-  data.tar.gz: a806c489d3ca99d77a622dc1248208ffd887ee38
+  metadata.gz: 1c1ce443c7aebf8ad72c144e835178828eb39be6
+  data.tar.gz: 1038e4f000b8c38cb3c1465f104cc2ef3baf383e
 SHA512:
-  metadata.gz: 437b74da06762c2cf1ece6b7dbaa7206177318a74f3c69e11a092e302173a99ac22c1262f5292ee7c536550034676416cdba7fae5066d7246a0743ecc855adcf
-  data.tar.gz: 1a42e9dbc1306de3e87ed252a43975e10b730601b2958ec3d14bd7869703c43386cc867bbb69882f37107a9831c17b4feae81e0f382c666b08c2302d716535f0
+  metadata.gz: a7939d1dff7e649e5a533b5b4664799ce888fadc194d6ce7ecb489e989e361309485b104a388e13eb72a988004d33c77f597da003201c65f58eeb4d2357be97c
+  data.tar.gz: 1c1a7091a71ecada1468d90af6de48a779eb206e55a5b0427aa4e7393e0c12c4d5c0e89119da7bc29b4d4acd7a93d7104b84819109841182f00fda4994533d53

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # knife-mirror Change log
 
+## 0.1.1 (2015-09-25)
+
+- do not show orphaned cookbook count if count = 0
+- improve get_cookbook_meta: return valid (empty) metadata if endpoint (cookbook) does not exist
+
 ## 0.1.0 (2015-09-23)
 
 - Initial version (still lots of WIP)
@@ -12,3 +17,4 @@
 - configurable delay to ease load on Supermarkets
 - disable meta data replication, supermarket does not honor it anyways
 - add some initial docs to readme
+- switch gpl license I defaulted my repo with, to Apache 2.0

data/README.md

@@ -47,10 +47,6 @@ If the requested catagory does not exist, supermarket refuses to accept the cook
 
 So obviously need to revisit that.
 
-Last minute: Just noticed during some final tests, before releasing this first version; if you attempt a ```knife mirror cookbook all``` or ```knife mirror all``` to an 'empty' new fresh supermarket, things will fail.
-Please, as a workaround for now, just mirror a recent version for some cookbook first, as in, ```knife mirror apt -t https://supermarket.your.domain.tld```.
-I'll fix this asap, simply need to add some endpoint checking of course, mea culpa.
-
 ## Requirements
 
 - You need to have Chef Knife working

data/lib/chef/knife/mirror.rb

@@ -25,6 +25,7 @@ class Chef
       category 'mirror'
 
       deps do
+        require 'chef/cookbook/metadata'
         require 'chef/cookbook_site_streaming_uploader'
       end
 
@@ -75,7 +76,7 @@ class Chef
           ui.info('Done!')
           removed, added = universe_diff(private_universe, community_universe)
           ui.info("We are still missing #{added.size} cookbooks (out of #{community_universe.size}) on our target Supermarket.")
-          ui.info("Though we're not doing anything with these just yet, you should know we have #{removed.size} cookbooks which are no longer present on the Supermarket (source).")
+          ui.info("Though we're not doing anything with these just yet, you should know we have #{removed.size} cookbooks which are no longer present on the Supermarket (source).") if removed.size > 0
           added.sort.each do |cookbook, versions|
             ui.info("Mirroring #{versions.size} version(s) for #{cookbook} cookbook:")
             displayed_before = false
@@ -160,6 +161,15 @@ class Chef
 
       def get_cookbook_meta(cookbook = @name_args[0], api_url = "#{config[:supermarket_site]}/api/v1/cookbooks")
         unauthenticated_get_rest("#{api_url}/#{cookbook}")
+      rescue => e
+        if e.message =~ /404/
+          # Return proper (empty) metadata structure
+          md = Chef::Cookbook::Metadata.new
+          return md.to_hash.merge!('metrics' => { 'downloads' => { 'versions' => {} } })
+        else
+          ui.error("Error during #{cookbook} metadata request (#{e.message}). Increase log verbosity (-VV) for more information.")
+          exit(1)
+        end
       end
 
       def cookbook_deprecated?(cookbookmeta)

data/lib/knife-mirror/version.rb

@@ -1,5 +1,5 @@
 # KnifeMirror version
 module KnifeMirror
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
   MAJOR, MINOR, TINY = VERSION.split('.')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-mirror
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - G.J. Moed
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-23 00:00:00.000000000 Z
+date: 2015-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef