knife-mirror 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c1ce443c7aebf8ad72c144e835178828eb39be6
-  data.tar.gz: 1038e4f000b8c38cb3c1465f104cc2ef3baf383e
+  metadata.gz: 6959dcdea79bcf027844a95a0f6c256ed3077ca8
+  data.tar.gz: 93c33862179f3ba34e8827edfa79c72ad1513a2f
 SHA512:
-  metadata.gz: a7939d1dff7e649e5a533b5b4664799ce888fadc194d6ce7ecb489e989e361309485b104a388e13eb72a988004d33c77f597da003201c65f58eeb4d2357be97c
-  data.tar.gz: 1c1a7091a71ecada1468d90af6de48a779eb206e55a5b0427aa4e7393e0c12c4d5c0e89119da7bc29b4d4acd7a93d7104b84819109841182f00fda4994533d53
+  metadata.gz: ac65600e7f31d661f19f4172835d1e5e7562b0f6aaa125e3216ea4cb40af04da5dc2dd79de51d359d9a125860677233970141234d6ccd448f1605f4bbe188448
+  data.tar.gz: fc84b432fd62a404b6d11e8556ef29cb82850efc11c91f763f5774da1a8a554c88bcae5d141ec55208d704ccc01b44a47c1b9ef0b8f6cb0ba807c7fee2c9d98a

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # knife-mirror Change log
 
+## 0.1.2 (2015-09-28)
+
+- process cookbook dependencies, if requested
+
 ## 0.1.1 (2015-09-25)
 
 - do not show orphaned cookbook count if count = 0

data/README.md

@@ -18,6 +18,7 @@ oh, and, this is my first ever Gem, I don't have a clue what I'm doing...
 - specify source and target Supermarkets
 - save failed cookbook versions
 - configurable delay to ease load on Supermarkets
+- process cookbook direct dependencies as well
 
 Most is based on working with diffs between source and target so we do not waste too many resources.
 
@@ -64,7 +65,7 @@ gem install knife-mirror
 or obtain this source (git clone or whatever) and
 
 ```
-gem build knife-mirror.gemspec; gem install knife-mirror-0.1.0.gem
+gem build knife-mirror.gemspec; gem install knife-mirror-0.1.2.gem
 ```
 
 ## Use
@@ -82,6 +83,12 @@ Then things are really simple, while we still work on more advanced stuff:
 knife mirror apt -t https://supermarket.your.domain.tld
 ```
 
+### Only most recent version for a specific cookbook, plus its dependencies
+
+```
+knife mirror apt -t https://supermarket.your.domain.tld --deps
+```
+
 ### Specific cookbook version
 
 ```
@@ -125,7 +132,6 @@ Wow, still lots to do, lots of wishes :(
 - proper replication of deprecation flag (not honored as part of the cookbook meta upload)
 - proper replication of urls (same reason)
 - replicate (and create) categories?
-- process dependencies
 - process replacement in case we're mirroring a deprecated cookbook
 - some automated testing
 - more/better docs?

data/lib/chef/knife/mirror.rb

@@ -26,6 +26,7 @@ class Chef
 
       deps do
         require 'chef/cookbook/metadata'
+        require 'chef/version_constraint'
         require 'chef/cookbook_site_streaming_uploader'
       end
 
@@ -56,7 +57,7 @@ class Chef
 
       option :deps,
              long: '--deps',
-             description: 'Also process cookbook(s) dependencies. (TODO/WIP)'
+             description: 'Also process cookbook(s) dependencies.'
 
       option :reps,
              long: '--reps',
@@ -111,6 +112,21 @@ class Chef
           # Mirror just one single cookbook, latest version
           ui.info("Mirroring #{@name_args[0]} (latest version).")
           mirror_cookbook
+          if config[:deps]
+            ui.info('Mirroring dependencies as well...')
+            print "Fetching cookbook index from #{config[:supermarket_site]} (source)... "
+            universe = unauthenticated_get_rest("#{config[:supermarket_site]}/universe")
+            ui.info('Done!')
+            get_cookbook_version_meta['dependencies'].each do |cookbook, version_constraint|
+              universe[cookbook].sort_by { |version, _versionmeta| version.split('.').map(&:to_i) }.reverse!.each do |version, _versionmeta|
+                next unless Chef::VersionConstraint.new(version_constraint).include?(version)
+                ui.info("Most recent version matching constraint (#{version_constraint}) for cookbook #{cookbook}: #{version}")
+                mirror_cookbook(cookbook, version)
+                sleep(config[:delay].to_i) if config[:delay]
+                break
+              end
+            end
+          end
         end
       end
 
@@ -172,6 +188,10 @@ class Chef
         end
       end
 
+      def get_cookbook_version_meta(cookbook = @name_args[0], version = 'latest_version', api_url = "#{config[:supermarket_site]}/api/v1/cookbooks")
+        version == 'latest_version' ? unauthenticated_get_rest(get_cookbook_meta(cookbook, api_url)[version]) : unauthenticated_get_rest("#{api_url}/#{cookbook}/versions/#{version.gsub('.', '_')}")
+      end
+
       def cookbook_deprecated?(cookbookmeta)
         cookbookmeta['deprecated'] == true
       end

data/lib/knife-mirror/version.rb

@@ -1,5 +1,5 @@
 # KnifeMirror version
 module KnifeMirror
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
   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.1
+  version: 0.1.2
 platform: ruby
 authors:
 - G.J. Moed
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-25 00:00:00.000000000 Z
+date: 2015-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef