emeril 0.6.0 → 0.7.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f6302d107f9d6cf6b6b69b14bd4f6f0514d50fe6
+  data.tar.gz: 1e89c4e9dfdba1758ce8d4cba37cf513bb0e3afb
+SHA512:
+  metadata.gz: e8b707e4affd40fe9520dc2ed28717b761abab6ff7d020cebebc6f07d5059327ecbcc7409466b42dc8c7801c679feded3e4e54e16bbd34e9455ec9ae9b05081b
+  data.tar.gz: 987c6de17c5bfbcc63fdde1607dfe3f4a002cc095b291856bfd7f65bb9801ba7dd6bf0fd60e26e211fc09bd095ab3d610b5542cd93ee4ed0f44b6fe17d54b016

data/.travis.yml

@@ -6,6 +6,17 @@ rvm:
 - 1.9.2
 - ruby-head
 
+env:
+- "CHEF_VERSION="
+- "CHEF_VERSION='~> 11.6.0'"
+- "CHEF_VERSION='~> 11.4.4'"
+- "CHEF_VERSION='~> 10.26'"
+
 matrix:
   allow_failures:
   - rvm: ruby-head
+  exclude:
+  - rvm: 2.0.0
+    env: "CHEF_VERSION='~> 11.4.4'"
+  - rvm: 2.0.0
+    env: "CHEF_VERSION='~> 10.26'"

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+## 0.7.0 / 2013-08-26
+
+### Breaking Changes
+
+* Drop support for Chef version 0.10.10. ([@fnichol][])
+
+### Bug fixes
+
+* Pull request [#2][]: Dont set default publisher when community site is false. ([@capen][])
+
+### Improvements
+
+* Add integration test suite and explicitly test against different versions of Chef. ([@fnichol][])
+
+
 ## 0.6.0 / 2013-05-30
 
 ### Bug fixes
@@ -22,5 +37,7 @@ The initial release, **BAM**!
 
 <!--- The following link definition list is generated by PimpMyChangelog --->
 [#1]: https://github.com/fnichol/emeril/issues/1
+[#2]: https://github.com/fnichol/emeril/issues/2
+[@capen]: https://github.com/capen
 [@fnichol]: https://github.com/fnichol
 [@thbishop]: https://github.com/thbishop

data/Gemfile

@@ -1,3 +1,8 @@
 source 'https://rubygems.org'
 
 gemspec
+
+group :test do
+  # allow CI to override the version of Chef for matrix testing
+  gem 'chef', (ENV['CHEF_VERSION'] || '>= 0.10.10')
+end

data/Guardfile

@@ -1,6 +1,6 @@
 guard 'minitest' do
   watch(%r|^spec/(.*)_spec\.rb|)
-  watch(%r|^lib/(.*)([^/]+)\.rb|)     { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
+  watch(%r|^lib/(.*)([^/]+)\.rb|)     { |m| "spec/unit/#{m[1]}#{m[2]}_spec.rb" }
   watch(%r|^spec/spec_helper\.rb|)    { "spec" }
 end
 

data/README.md

@@ -54,6 +54,7 @@ considered production cookbook files:
 * `CHANGELOG.*`
 * `metadata.{json,rb}`
 * `attributes/**/*`
+* `definitions/**/*`
 * `files/**/*`
 * `libraries/**/*`
 * `providers/**/*`

data/Rakefile

@@ -5,12 +5,18 @@ require 'tailor/rake_task'
 
 Rake::TestTask.new(:unit) do |t|
   t.libs.push "lib"
-  t.test_files = FileList['spec/**/*_spec.rb']
+  t.test_files = FileList['spec/unit/**/*_spec.rb']
+  t.verbose = true
+end
+
+Rake::TestTask.new(:integration) do |t|
+  t.libs.push "lib"
+  t.test_files = FileList['spec/integration/**/*_spec.rb']
   t.verbose = true
 end
 
 desc "Run all test suites"
-task :test => [:unit]
+task :test => [:unit, :integration]
 
 desc "Run cane to check quality metrics"
 Cane::RakeTask.new do |cane|

data/emeril.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 1.9.2'
 
-  spec.add_dependency 'chef', '>= 0.10.10'
+  spec.add_dependency 'chef', '> 0.10.10'
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'

data/lib/emeril/publisher.rb

@@ -99,6 +99,7 @@ module Emeril
       def msg(message)
         logger ? logger.info(message) : super
       end
+      alias_method :info, :msg
 
       def err(message)
         logger ? logger.error(message) : super

data/lib/emeril/releaser.rb

@@ -36,8 +36,8 @@ module Emeril
       @metadata = options.fetch(:metadata) { default_metadata }
       @category = options.fetch(:category) { default_category }
       @git_tagger = options.fetch(:git_tagger) { default_git_tagger }
-      @publisher = options.fetch(:publisher) { default_publisher }
       @publish_to_community = options.fetch(:publish_to_community) { true }
+      set_publisher(options.fetch(:publisher, nil)) if publish_to_community
     end
 
     # Tags and releases a cookbook.
@@ -77,6 +77,10 @@ module Emeril
       )
     end
 
+    def set_publisher(publisher)
+      @publisher = publisher || default_publisher
+    end
+
     def default_category
       Category.for_cookbook(metadata[:name]) || "Other"
     end

data/lib/emeril/version.rb

@@ -2,5 +2,5 @@
 
 module Emeril
 
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

data/spec/fixtures/client_key.pem

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEA0sOY9tHvVtLZ6xmVmH8d8LrRrNcWOXbrvvCrai+T3GtRvRSL
+hksLrpOpD0L9EHM6NdThNF/eGA9Oq+UKAe6yXR0hwsKuxKXqQ8SEmlhZZ9GiuggD
+B/zYD3ItB6SGpdkRe7kQqTChQyrIXqbRkJqxoTXLyeJDF0sCyTdp3L8IZCUWodM8
+oV9TlQBJHYtG1gLUwIi8kcMVEoCn2Q8ltCj0/ftnwhTtwO52RkWA0uYOLGVayHsL
+SCFfx+ACWPU/oWCwW5/KBqb3veTv0aEg/nh0QsFzRLoTx6SRFI5dT2Nf8iiJe4WC
+UG8WKEB2G8QPnxsxfOPYDBdTJ4CXEi2e+z41VQIDAQABAoIBAALhqbW2KQ+G0nPk
+ZacwFbi01SkHx8YBWjfCEpXhEKRy0ytCnKW5YO+CFU2gHNWcva7+uhV9OgwaKXkw
+KHLeUJH1VADVqI4Htqw2g5mYm6BPvWnNsjzpuAp+BR+VoEGkNhj67r9hatMAQr0I
+itTvSH5rvd2EumYXIHKfz1K1SegUk1u1EL1RcMzRmZe4gDb6eNBs9Sg4im4ybTG6
+pPIytA8vBQVWhjuAR2Tm+wZHiy0Az6Vu7c2mS07FSX6FO4E8SxWf8idaK9ijMGSq
+FvIS04mrY6XCPUPUC4qm1qNnhDPpOr7CpI2OO98SqGanStS5NFlSFXeXPpM280/u
+fZUA0AECgYEA+x7QUnffDrt7LK2cX6wbvn4mRnFxet7bJjrfWIHf+Rm0URikaNma
+h0/wNKpKBwIH+eHK/LslgzcplrqPytGGHLOG97Gyo5tGAzyLHUWBmsNkRksY2sPL
+uHq6pYWJNkqhnWGnIbmqCr0EWih82x/y4qxbJYpYqXMrit0wVf7yAgkCgYEA1twI
+gFaXqesetTPoEHSQSgC8S4D5/NkdriUXCYb06REcvo9IpFMuiOkVUYNN5d3MDNTP
+IdBicfmvfNELvBtXDomEUD8ls1UuoTIXRNGZ0VsZXu7OErXCK0JKNNyqRmOwcvYL
+JRqLfnlei5Ndo1lu286yL74c5rdTLs/nI2p4e+0CgYB079ZmcLeILrmfBoFI8+Y/
+gJLmPrFvXBOE6+lRV7kqUFPtZ6I3yQzyccETZTDvrnx0WjaiFavUPH27WMjY01S2
+TMtO0Iq1MPsbSrglO1as8MvjB9ldFcvp7gy4Q0Sv6XT0yqJ/S+vo8Df0m+H4UBpU
+f5o6EwBSd/UQxwtZIE0lsQKBgQCswfjX8Eg8KL/lJNpIOOE3j4XXE9ptksmJl2sB
+jxDnQYoiMqVO808saHVquC/vTrpd6tKtNpehWwjeTFuqITWLi8jmmQ+gNTKsC9Gn
+1Pxf2Gb67PqnEpwQGln+TRtgQ5HBrdHiQIi+5am+gnw89pDrjjO5rZwhanAo6KPJ
+1zcPNQKBgQDxFu8v4frDmRNCVaZS4f1B6wTrcMrnibIDlnzrK9GG6Hz1U7dDv8s8
+Nf4UmeMzDXjlPWZVOvS5+9HKJPdPj7/onv8B2m18+lcgTTDJBkza7R1mjL1Cje/Z
+KcVGsryKN6cjE7yCDasnA7R2rVBV/7NWeJV77bmzT5O//rW4yIfUIg==
+-----END RSA PRIVATE KEY-----

data/spec/fixtures/vcr_cassettes/new_release.yml

@@ -0,0 +1,125 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://cookbooks.opscode.com/api/v1/cookbooks/emeril
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - ! '*/*'
+      User-Agent:
+      - Ruby
+      X-Ops-Userid: opsycodesy
+  response:
+    status:
+      code: 404
+      message: Not Found
+    headers:
+      Server:
+      - ngx_openresty
+      Date:
+      - Tue, 27 Aug 2013 04:18:43 GMT
+      Content-Type:
+      - text/html; charset=utf-8
+      Content-Length:
+      - '71'
+      Connection:
+      - keep-alive
+      Status:
+      - 404 Not Found
+      Cache-Control:
+      - no-cache
+    body:
+      encoding: US-ASCII
+      string: ! '{"error_messages":["Resource does not exist"],"error_code":"NOT_FOUND"}'
+    http_version: 
+  recorded_at: Tue, 27 Aug 2013 04:18:43 GMT
+- request:
+    method: post
+    uri: http://cookbooks.opscode.com/api/v1/cookbooks
+    body:
+      encoding: ASCII-8BIT
+      string: !binary |-
+        LS0tLS0tUnVieU11bHRpcGFydENsaWVudDY5NDgxNlpaWlpaDQpDb250ZW50
+        LURpc3Bvc2l0aW9uOiBmb3JtLWRhdGE7IG5hbWU9InRhcmJhbGwiOyBmaWxl
+        bmFtZT0iZW1lcmlsLnRneiINCkNvbnRlbnQtVHlwZTogYXBwbGljYXRpb24v
+        b2N0ZXQtc3RyZWFtDQoNCh+LCACjKBxSAAPtl1FvmzAQx/PMp/DY60SAAJH2
+        tE7tY1+mvVcGDvAGNrJNp2rqd58pjkbcRlE1yFT1flLk4DvZZx//w4YOJGu3
+        mzUJw3CfpuSpzabWcGinhyiOw30YJ3GyI2G0i8L9hqSrRmUZlKbShFJxVjSi
+        Pen3qwE4bd04iyKLx7kSMOW/A01LqmnwQwm+9BxmP7IkOZ1/k3cn/2maRRsS
+        Lh3IS7zz/P/2CPE57cD/TPzpZfA/jX0lqEKyXjPBR9O1YLwmSg9V9WFyaAWv
+        7856dZRxbX4gR/ut2WMKLfnaDrpxHe7A/G9Ht25y+5KPbkEhOjsjK4Crp0iv
+        elo0QOIgnEx9S3UlZKeMcVzSo11DD7wEXjA4Nkgwg3bGRsfIj21qqGtQz/sL
+        wSsTgTYrPOrvpbhnpdsrwYRUuL1Ua8nyQTvh1FIMvfF9FiTrHc97kMrudRJE
+        QeR7j/+Wf1f/Ml/mvZpzTv+7eO/qP44y1P8lGKVP5hyKgPdXmAfLsXo9V7kv
+        6dazmp2NP5OuNysf1npUQTy3xrh2K4fZ6FYV/3tb3wxW/99urq5vb4KuXGOO
+        c/o3BcDRf7LD7/9l+Ei+GzHmQJUmoiL68KBQQu8Cq3971ljnHvj6+1+SJhHe
+        /y6Bk/8SKjq0etlj4Nn6n2RO/rM0irH+X4KSmdRrIR+Iv9Vdv30Aao52njmj
+        /aQ1ED+nqsHjFIIgCIIgCIIgCIIgCIIgyNvjDyUZemYAKAAADQotLS0tLS1S
+        dWJ5TXVsdGlwYXJ0Q2xpZW50Njk0ODE2WlpaWloNCkNvbnRlbnQtRGlzcG9z
+        aXRpb246IGZvcm0tZGF0YTsgbmFtZT0iY29va2Jvb2siDQoNCnsiY2F0ZWdv
+        cnkiOiJPdGhlciJ9DQotLS0tLS1SdWJ5TXVsdGlwYXJ0Q2xpZW50Njk0ODE2
+        WlpaWlotLQ0K
+    headers:
+      Accept:
+      - application/json
+      X-Chef-Version:
+      - 11.4.4
+      X-Ops-Sign:
+      - algorithm=sha1;version=1.0;
+      X-Ops-Userid: opsycodesy
+      X-Ops-Timestamp:
+      - '2013-08-27T04:18:43Z'
+      X-Ops-Content-Hash:
+      - ! '{{X-Ops-Content-Hash}}'
+      X-Ops-Authorization-1:
+      - ! '{{X-Ops-Authorization-1}}'
+      X-Ops-Authorization-2:
+      - ! '{{X-Ops-Authorization-2}}'
+      X-Ops-Authorization-3:
+      - ! '{{X-Ops-Authorization-3}}'
+      X-Ops-Authorization-4:
+      - ! '{{X-Ops-Authorization-4}}'
+      X-Ops-Authorization-5:
+      - ! '{{X-Ops-Authorization-5}}'
+      X-Ops-Authorization-6:
+      - ! '{{X-Ops-Authorization-6}}'
+      User-Agent:
+      - Ruby
+      Content-Length:
+      - '864'
+      Content-Type:
+      - multipart/form-data; boundary=----RubyMultipartClient694816ZZZZZ
+  response:
+    status:
+      code: 201
+      message: Created
+    headers:
+      Server:
+      - ngx_openresty
+      Date:
+      - Tue, 27 Aug 2013 04:18:45 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Content-Length:
+      - '55'
+      Connection:
+      - keep-alive
+      Status:
+      - 201 Created
+      Location:
+      - http://cookbooks.opscode.com/cookbooks/emeril
+      Cache-Control:
+      - no-cache
+      Set-Cookie:
+      - logged-in-username=fnichol; domain=.opscode.com; path=/
+      X-Runtime:
+      - '2344'
+    body:
+      encoding: US-ASCII
+      string: ! '{"uri":"http://cookbooks.opscode.com/cookbooks/emeril"}'
+    http_version: 
+  recorded_at: Tue, 27 Aug 2013 04:18:45 GMT
+recorded_with: VCR 2.5.0

data/spec/integration/new_release_spec.rb

@@ -0,0 +1,69 @@
+# -*- encoding: utf-8 -*-
+
+require_relative '../spec_helper'
+require 'vcr'
+
+require 'chef/knife'
+require 'emeril'
+
+VCR.configure do |config|
+  config.cassette_library_dir = "spec/fixtures/vcr_cassettes"
+  config.hook_into :webmock
+
+  # remove sensitive authentication information from the recording
+  config.before_record do |interaction|
+    headers = interaction.request.headers
+    headers.keys.
+      select { |k| k =~ /^X-Ops-(Authorization-|Content-Hash)/ }.
+      each { |header| headers[header] = Array("{{#{header}}}") }
+    headers["X-Ops-Userid"] = "opsycodesy"
+  end
+end
+
+describe "Releasing and publishing a cookbook" do
+
+  include Emeril::SpecCommon
+
+  before do
+    @saved = Hash.new
+    %w{node_name client_key}.map(&:to_sym).each do |attr|
+      @saved[attr] = Chef::Config[attr]
+    end
+
+    Chef::Config[:node_name] = ENV["CHEF_NODE_NAME"] || "opsycodesy"
+    Chef::Config[:client_key] = ENV["CHEF_CLIENT_KEY"] || make_client_key!
+  end
+
+  after do
+    %w{node_name client_key}.map(&:to_sym).each do |attr|
+      Chef::Config[attr] = @saved.delete(attr)
+    end
+
+    FileUtils.remove_dir(cookbook_path)
+  end
+
+  let(:cookbook_path)  { File.join(Dir.mktmpdir, "emeril")}
+
+  let(:logger) do
+    if ENV["DEBUG"]
+      Chef::Log.level = Logger::DEBUG
+      l = Logger.new(STDOUT)
+      l.level = Logger::DEBUG
+      l
+    else
+      Logger.new(StringIO.new)
+    end
+  end
+
+  it "releases a new cookbook" do
+    make_cookbook!(version: "1.2.3")
+
+    VCR.use_cassette('new_release') do
+      Emeril::Releaser.new(logger: logger, source_path: cookbook_path).run
+    end
+
+    # tag was pushed to the remote
+    git_tag = run_cmd("git tag", in: "#{File.dirname(cookbook_path)}/remote")
+    git_tag.chomp.must_equal "v1.2.3"
+  end
+end

data/spec/integration/skip_publish_spec.rb

@@ -0,0 +1,54 @@
+# -*- encoding: utf-8 -*-
+
+require_relative '../spec_helper'
+require 'vcr'
+
+require 'chef/knife'
+require 'emeril'
+
+describe "Releasing and but not publishing a cookbook" do
+
+  include Emeril::SpecCommon
+
+  let(:cookbook_path)  { File.join(Dir.mktmpdir, "emeril")}
+
+  let(:logger) do
+    if ENV["DEBUG"]
+      Chef::Log.level = Logger::DEBUG
+      l = Logger.new(STDOUT)
+      l.level = Logger::DEBUG
+      l
+    else
+      Logger.new(StringIO.new)
+    end
+  end
+
+  it "releases a new cookbook" do
+    make_cookbook!(version: "4.5.6")
+
+    VCR.use_cassette('new_release') do
+      Emeril::Releaser.new(
+        logger: logger, source_path: cookbook_path, publish_to_community: false
+      ).run
+    end
+
+    # tag was pushed to the remote
+    git_tag = run_cmd("git tag", in: "#{File.dirname(cookbook_path)}/remote")
+    git_tag.chomp.must_equal "v4.5.6"
+  end
+
+  it "releases a new cookbook with a custom git tag prefix" do
+    make_cookbook!(version: "1.0.0")
+
+    VCR.use_cassette('new_release') do
+      Emeril::Releaser.new(
+        logger: logger, source_path: cookbook_path, publish_to_community: false,
+        tag_prefix: "release-"
+      ).run
+    end
+
+    # tag was pushed to the remote
+    git_tag = run_cmd("git tag", in: "#{File.dirname(cookbook_path)}/remote")
+    git_tag.chomp.must_equal "release-1.0.0"
+  end
+end

data/spec/spec_helper.rb

@@ -25,3 +25,72 @@ class IO
     File.open(args[0], "rb") { |f| f.read(args[1]) }
   end
 end
+
+require 'chef'
+require 'chef/cookbook_site_streaming_uploader'
+class Chef
+  class CookbookSiteStreamingUploader
+    class MultipartStream
+      alias_method :read_original, :read
+
+      def read(how_much = nil)
+        read_original(how_much || size)
+      end
+    end
+  end
+end
+
+module Emeril
+
+  module SpecCommon
+
+    def make_cookbook!(opts = {})
+      FileUtils.mkdir_p("#{cookbook_path}/recipes")
+      remote_dir = File.join(File.dirname(cookbook_path), "remote")
+
+      File.open("#{cookbook_path}/metadata.rb", "wb") do |f|
+        f.write <<-METADATA_RB.gsub(/^ {10}/, '')
+          name             "#{opts.fetch(:name, "emeril")}"
+          maintainer       "Michael Bluth"
+          maintainer_email "michael@bluth.com"
+          license          "Apache 2.0"
+          description      "Doing stuff!"
+          long_description "Doing stuff!"
+          version          "#{opts.fetch(:version, "4.1.1")}"
+        METADATA_RB
+      end
+      File.open("#{cookbook_path}/recipes/default.rb", "wb") do |f|
+        f.write <<-DEFAULT_RB.gsub(/^ {10}/, '')
+          directory "/tmp/yeah"
+
+          package "bash"
+        DEFAULT_RB
+      end
+      File.open("#{cookbook_path}/README.md", "wb") do |f|
+        f.write <<-README.gsub(/^ {10}/, '')
+          # The beast of the beasts
+        README
+      end
+
+      run_cmd [
+        %{git init},
+        %{git config user.email "you@example.com"},
+        %{git config user.name "Your Name"},
+        %{git add .},
+        %{git commit -m "Initial"},
+        %{git remote add origin #{remote_dir}},
+        %{git init --bare #{remote_dir}}
+      ].join(" && ")
+    end
+
+    def make_client_key!
+      file = "#{File.dirname(cookbook_path)}/client_key.pem"
+      FileUtils.cp("#{File.dirname(__FILE__)}/fixtures/client_key.pem", file)
+      file
+    end
+
+    def run_cmd(cmd, opts = {})
+      %x{cd #{opts.fetch(:in, cookbook_path)} && #{cmd}}
+    end
+  end
+end

data/spec/{emeril → unit/emeril}/category_spec.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 
-require_relative '../spec_helper'
+require_relative '../../spec_helper'
 require 'vcr'
 
 require 'emeril/category'

data/spec/{emeril → unit/emeril}/git_tagger_spec.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 
-require_relative '../spec_helper'
+require_relative '../../spec_helper'
 require 'tmpdir'
 require 'logger'
 
@@ -8,11 +8,13 @@ require 'emeril/git_tagger'
 
 describe Emeril::GitTagger do
 
-  let(:sandbox_path)  { File.join(Dir.mktmpdir, "emeril") }
+  include Emeril::SpecCommon
+
+  let(:cookbook_path)  { File.join(Dir.mktmpdir, "emeril") }
 
   let(:git_tagger) do
     Emeril::GitTagger.new(
-      :source_path => sandbox_path,
+      :source_path => cookbook_path,
       :version => "4.1.1",
       :logger => nil
     )
@@ -32,7 +34,7 @@ describe Emeril::GitTagger do
     end
 
     after do
-      FileUtils.remove_dir(sandbox_path)
+      FileUtils.remove_dir(cookbook_path)
     end
 
     it "tags the repo" do
@@ -42,7 +44,7 @@ describe Emeril::GitTagger do
 
     it "disables the tag prefix" do
       Emeril::GitTagger.new(
-        :source_path => sandbox_path,
+        :source_path => cookbook_path,
         :version => "4.1.1",
         :logger => nil,
         :tag_prefix => false
@@ -53,7 +55,7 @@ describe Emeril::GitTagger do
 
     it "uses a custom tag prefix" do
       Emeril::GitTagger.new(
-        :source_path => sandbox_path,
+        :source_path => cookbook_path,
         :version => "4.1.1",
         :logger => nil,
         :tag_prefix => "version-"
@@ -72,7 +74,7 @@ describe Emeril::GitTagger do
     describe "when git repo is not clean" do
 
       before do
-        File.open("#{sandbox_path}/README.md", "wb") { |f| f.write "Yep." }
+        File.open("#{cookbook_path}/README.md", "wb") { |f| f.write "Yep." }
       end
 
       it "raises GitNotCleanError" do
@@ -104,44 +106,4 @@ describe Emeril::GitTagger do
       end
     end
   end
-
-  private
-
-  def make_cookbook!
-    FileUtils.mkdir_p("#{sandbox_path}/recipes")
-    remote_dir = File.join(File.dirname(sandbox_path), "remote")
-
-    File.open("#{sandbox_path}/metadata.rb", "wb") do |f|
-      f.write <<-METADATA_RB.gsub(/^ {8}/, '')
-        name             "#{name}"
-        maintainer       "Michael Bluth"
-        maintainer_email "michael@bluth.com"
-        license          "Apache 2.0"
-        description      "Doing stuff!"
-        long_description "Doing stuff!"
-        version          "4.1.1"
-      METADATA_RB
-    end
-    File.open("#{sandbox_path}/recipes/default.rb", "wb") do |f|
-      f.write <<-DEFAULT_RB.gsub(/^ {8}/, '')
-        directory "/tmp/yeah"
-
-        package "bash"
-      DEFAULT_RB
-    end
-
-    run_cmd [
-      %{git init},
-      %{git config user.email "you@example.com"},
-      %{git config user.name "Your Name"},
-      %{git add .},
-      %{git commit -m "Initial"},
-      %{git remote add origin #{remote_dir}},
-      %{git init --bare #{remote_dir}}
-    ].join(" && ")
-  end
-
-  def run_cmd(cmd, opts = {})
-    %x{cd #{opts.fetch(:in, sandbox_path)} && #{cmd}}
-  end
 end

data/spec/{emeril → unit/emeril}/metadata_chopper_spec.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 
-require_relative '../spec_helper'
+require_relative '../../spec_helper'
 
 require 'emeril/metadata_chopper'
 

data/spec/{emeril → unit/emeril}/publisher_spec.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 
-require_relative '../spec_helper'
+require_relative '../../spec_helper'
 require 'chef/knife'
 require 'chef/config'
 

data/spec/{emeril → unit/emeril}/releaser_spec.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 
-require_relative '../spec_helper'
+require_relative '../../spec_helper'
 
 require 'emeril/releaser'
 
@@ -98,6 +98,17 @@ describe Emeril::Releaser do
       )
     end
 
+    it "does not call Publisher when disabling community site publishing" do
+      Emeril::Publisher.expects(:new).never
+
+      Emeril::Releaser.new(
+        :source_path => source_path,
+        :metadata => metadata,
+        :category => category,
+        :publish_to_community => false
+      )
+    end
+
     it "disables the git version tag prefix" do
       Emeril::GitTagger.expects(:new).with do |opts|
         opts[:tag_prefix] == false

metadata

@@ -1,36 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: emeril
 version: !ruby/object:Gem::Version
-  version: 0.6.0
-  prerelease: 
+  version: 0.7.0
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-30 00:00:00.000000000 Z
+date: 2013-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>'
       - !ruby/object:Gem::Version
         version: 0.10.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>'
       - !ruby/object:Gem::Version
         version: 0.10.10
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,193 +41,169 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: cane
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-cane
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: tailor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: countloc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Release Chef cookbooks
@@ -266,45 +237,52 @@ files:
 - lib/emeril/thor.rb
 - lib/emeril/thor_tasks.rb
 - lib/emeril/version.rb
-- spec/emeril/category_spec.rb
-- spec/emeril/git_tagger_spec.rb
-- spec/emeril/metadata_chopper_spec.rb
-- spec/emeril/publisher_spec.rb
-- spec/emeril/releaser_spec.rb
+- spec/fixtures/client_key.pem
 - spec/fixtures/vcr_cassettes/known_cookbook.yml
+- spec/fixtures/vcr_cassettes/new_release.yml
 - spec/fixtures/vcr_cassettes/nonexistant_cookbook.yml
+- spec/integration/new_release_spec.rb
+- spec/integration/skip_publish_spec.rb
 - spec/spec_helper.rb
+- spec/unit/emeril/category_spec.rb
+- spec/unit/emeril/git_tagger_spec.rb
+- spec/unit/emeril/metadata_chopper_spec.rb
+- spec/unit/emeril/publisher_spec.rb
+- spec/unit/emeril/releaser_spec.rb
 homepage: https://github.com/fnichol/emeril
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Release Chef cookbooks
 test_files:
-- spec/emeril/category_spec.rb
-- spec/emeril/git_tagger_spec.rb
-- spec/emeril/metadata_chopper_spec.rb
-- spec/emeril/publisher_spec.rb
-- spec/emeril/releaser_spec.rb
+- spec/fixtures/client_key.pem
 - spec/fixtures/vcr_cassettes/known_cookbook.yml
+- spec/fixtures/vcr_cassettes/new_release.yml
 - spec/fixtures/vcr_cassettes/nonexistant_cookbook.yml
+- spec/integration/new_release_spec.rb
+- spec/integration/skip_publish_spec.rb
 - spec/spec_helper.rb
+- spec/unit/emeril/category_spec.rb
+- spec/unit/emeril/git_tagger_spec.rb
+- spec/unit/emeril/metadata_chopper_spec.rb
+- spec/unit/emeril/publisher_spec.rb
+- spec/unit/emeril/releaser_spec.rb