dpl 1.7.10.travis.668.1 → 1.7.10.travis.673.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MWE4ODcyNGRiZWU4ZWQ4Y2EzN2FmMDlhN2ZkZmNhYzMzZTE2Mjk3Yw==
+    ZTkyMWJmOTAzNjg0NGJmYzBjYmU0Nzc2YjA0MjUzNzRjY2E4ZjQ0Ng==
   data.tar.gz: !binary |-
-    OTNlNjQ0NzJlYjlmNWI3OTAzNDVlZDI3MWZkZTBjYTAxYzEzMTBhNQ==
+    OTIxNTUyZmFlMzUwNzhlNTk5MDMxOTkzZDQ3NmZlM2EwZjE0ODU5Zg==
 SHA512:
   metadata.gz: !binary |-
-    YjViYmJmZjlmNDI2ODFlOTMzNWU0MGUzMmJmZmU1YzY0MmFlYTkwYzE1MmYw
-    ZmY0ZjAwYzdmMzFmM2M1MWI1M2M3NjMzNzgyZDI2YWM3MDU2MmRlYmQ4OTMx
-    OTE3NGZmNmQ2MDJkYzI0NzcwYzU2ODgxMjJiNjA0MmVkYzlhZDM=
+    NGU4MWY3YTlkMGExOWQ5YjE0NDE2NmIzYjM3NTVhYTE5NWUwYzA5MDY4YzRk
+    NmQyZDUxMTEyODgwZjVjOTg2NzFhMDNhMDUzMTM5ZjU1NjZhZjI4ZGVkNjUx
+    YTIwOGQ4MDkyMTRlOTI4ODhkMzhhMjFhODI5MDIwMDhlZmU2OTE=
   data.tar.gz: !binary |-
-    MmFjYTY4NjU1YjQxZmVhNTk1Njk0MTE2YTI1MDE0NDUzMjZjMWUwYzZhMzcz
-    ZWIzNzkzZTdhOGNiOGJkNjk1ZGUyOGNkNzVmNzhhZjQwNDA2OWI2OTA0Yzhl
-    NTllYjE4ZTgxYWIyOGIzOWY1ZmNmZTZhMDJkZjA0NzZjNmIzZjc=
+    YjdlMWJiY2MyODQxZjA1NTMxNDAxODY1NzZmODIzY2QzMTcwZmEzYjU2NGM1
+    NThkYjljN2ZmZWQwZDdkMDE4ZTFlYzVlZWE1NmQ4YWJhZDk0Njc5YzY3MjM1
+    NTUzNGRkNGJkNmE1ZTliNjE3MDg2NmFmYzZlMDdhYjJhZDM2ZDg=

data/Gemfile

@@ -1,7 +1,10 @@
 source 'https://rubygems.org'
 gemspec
 
-gem 'slop', '~> 3.6.0' # can drop this once Ruby 1.9.x is dropped
+platforms :mri_19 do
+  gem 'slop', '~> 3.6.0'
+  gem 'ohai', '~> 7.4.0'
+end
 
 group :heroku do
   gem 'rendezvous', '~> 0.0.2'
@@ -69,3 +72,7 @@ end
 group :packagecloud do
   gem 'packagecloud-ruby', '= 0.2.17'
 end
+
+group :chef_supermarket do
+  gem 'chef'
+end

data/README.md

@@ -31,6 +31,7 @@ Dpl supports the following providers:
 * [Elastic Beanstalk](#elastic-beanstalk)
 * [Puppet Forge](#puppet-forge)
 * [packagecloud](#packagecloud)
+* [Chef Supermarket](#chef-supermarket)
 
 ## Installation:
 
@@ -442,3 +443,16 @@ For accounts using two factor authentication, you have to use an oauth token as
     dpl --provider=packagecloud --username=packageuser --token=t0k3n --repository=myrepo
     dpl --provider=packagecloud --username=packageuser --token=t0k3n --repository=myrepo --dist=ubuntu/precise
     dpl --provider=packagecloud --username=packageuser --token=t0k3n --repository=myrepo --local-dir="${TRAVIS_BUILD_DIR}/pkgs" --dist=ubuntu/precise
+
+### Chef Supermarket:
+
+#### Options:
+
+ * **user_id**: Required. The user name at Chef Supermarket.
+ * **client_key**: Required. The client API key file name.
+ * **cookbook_category**: Required. The cookbook category in Supermarket (see: https://docs.getchef.com/knife_cookbook_site.html#id12 )
+
+#### Examples:
+
+    dpl --provider=chef-supermarket --user-id=chef --client-key=.travis/client.pem --cookbook-category=Others
+

data/lib/dpl/provider.rb

@@ -35,6 +35,7 @@ module DPL
     autoload :ElasticBeanstalk, 'dpl/provider/elastic_beanstalk'
     autoload :PuppetForge,  'dpl/provider/puppet_forge'
     autoload :Packagecloud, 'dpl/provider/packagecloud'
+    autoload :ChefSupermarket,  'dpl/provider/chef_supermarket'
 
 
     def self.new(context, options)

data/lib/dpl/provider/chef_supermarket.rb

@@ -0,0 +1,81 @@
+module DPL
+  class Provider
+    class ChefSupermarket < Provider
+
+      # Most of the code is inspired by:
+      # https://github.com/opscode/chef/blob/11.16.4/lib/chef/knife/cookbook_site_share.rb
+
+      requires 'chef', load: 'chef/config'
+      requires 'chef', load: 'chef/cookbook_loader'
+      requires 'chef', load: 'chef/cookbook_uploader'
+      requires 'chef', load: 'chef/cookbook_site_streaming_uploader'
+
+      attr_reader :cookbook_name, :cookbook_category
+      attr_reader :cookbook
+
+      def needs_key?
+        false
+      end
+
+      def check_auth
+        error "Missing user_id option" unless options[:user_id]
+        error "Missing client_key option" unless options[:client_key]
+        ::Chef::Config[:client_key] = options[:client_key]
+        error "#{options[:client_key]} does not exist" unless ::File.exist?(options[:client_key])
+      end
+
+      def check_app
+        @cookbook_name = options[:cookbook_name] || options[:app]
+        @cookbook_category = options[:cookbook_category]
+        unless cookbook_category
+          error "Missing cookbook_category option\n" +
+            "see https://docs.getchef.com/knife_cookbook_site.html#id12"
+        end
+
+        log "Validating cookbook #{cookbook_name}"
+        # Check that cookbook exist and is valid
+        # So we assume cookbook path is '..'
+        cl = ::Chef::CookbookLoader.new '..'
+        @cookbook = cl[cookbook_name]
+        ::Chef::CookbookUploader.new(cookbook, '..').validate_cookbooks
+      end
+
+      def push_app
+        log "Creating cookbook build directory"
+        tmp_cookbook_dir = Chef::CookbookSiteStreamingUploader.create_build_dir(cookbook)
+        log "Making tarball in #{tmp_cookbook_dir}"
+        system("tar -czf #{cookbook_name}.tgz #{cookbook_name}", :chdir => tmp_cookbook_dir)
+
+        uri = "http://cookbooks.opscode.com/api/v1/cookbooks"
+
+        log "Uploading to #{uri}"
+        category_string = { 'category'=>cookbook_category }.to_json
+        http_resp = ::Chef::CookbookSiteStreamingUploader.post(
+          uri,
+          options[:user_id],
+          options[:client_key],
+          {
+            :tarball => File.open("#{tmp_cookbook_dir}/#{cookbook_name}.tgz"),
+            :cookbook => category_string
+          }
+        )
+        res = ::Chef::JSONCompat.from_json(http_resp.body)
+        if http_resp.code.to_i != 201
+          if res['error_messages']
+            if res['error_messages'][0] =~ /Version already exists/
+              error "The same version of this cookbook already exists on the Opscode Cookbook Site."
+            else
+              error "#{res['error_messages'][0]}"
+            end
+          else
+            error "Unknown error while sharing cookbook\n" +
+              "Server response: #{http_resp.body}"
+          end
+        end
+
+        log "Upload complete."
+        ::FileUtils.rm_rf tmp_cookbook_dir
+      end
+    end
+  end
+end

data/spec/provider/chef_supermarket_spec.rb

@@ -0,0 +1,51 @@
+require 'spec_helper'
+require 'chef/cookbook_loader'
+require 'chef/cookbook_uploader'
+require 'dpl/provider/chef_supermarket'
+
+describe DPL::Provider::ChefSupermarket do
+  subject :provider do
+    described_class.new(
+      DummyContext.new,
+      app: 'example',
+      cookbook_category: 'Others',
+      user_id: 'user',
+      client_key: '/tmp/example.pem'
+    )
+  end
+
+  let(:cookbook_uploader) do
+    double('cookbook_uploader', validate_cookbooks: true)
+  end
+
+  let(:http_resp) do
+    double('http_resp', body: '{}', code: '201')
+  end
+
+  describe "#check_auth" do
+    example do
+      ::File.stub(:exist?).and_return(true)
+      expect(File).to receive(:exist?)
+      provider.check_auth
+    end
+  end
+
+  describe "#check_app" do
+    example do
+      ::Chef::CookbookLoader.any_instance.stub(:[]).and_return nil
+      expect(::Chef::CookbookUploader).to receive(:new).and_return(cookbook_uploader)
+      provider.check_app
+    end
+  end
+
+  describe "#push_app" do
+    example do
+      expect(::Chef::CookbookSiteStreamingUploader).to receive(:create_build_dir).and_return('/tmp/build_dir')
+      expect(provider).to receive(:system).and_return(true)
+      expect(::File).to receive(:open)
+      expect(::Chef::CookbookSiteStreamingUploader).to receive(:post).and_return(http_resp)
+      expect(::FileUtils).to receive(:rm_rf).with('/tmp/build_dir')
+      provider.push_app
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 1.7.10.travis.668.1
+  version: 1.7.10.travis.673.1
 platform: ruby
 authors:
 - Konstantin Haase
@@ -103,6 +103,7 @@ files:
 - lib/dpl/provider/appfog.rb
 - lib/dpl/provider/biicode.rb
 - lib/dpl/provider/bitballoon.rb
+- lib/dpl/provider/chef_supermarket.rb
 - lib/dpl/provider/cloud66.rb
 - lib/dpl/provider/cloud_files.rb
 - lib/dpl/provider/cloud_foundry.rb
@@ -142,6 +143,7 @@ files:
 - spec/cli_spec.rb
 - spec/provider/appfog_spec.rb
 - spec/provider/bitballoon_spec.rb
+- spec/provider/chef_supermarket_spec.rb
 - spec/provider/cloud66_spec.rb
 - spec/provider/cloud_files_spec.rb
 - spec/provider/cloudcontrol_spec.rb