omnibus 1.0.3 → 1.0.4

data/lib/omnibus/reports.rb

@@ -22,7 +22,7 @@ module Omnibus
 
 
     PADDING = 3
- 
+
     # Determine how wide a column should be, taking into account both
     # the column name as well as all data in that column.  If no data
     # will be stored in the column, the width is 0 (i.e., nothing
@@ -43,9 +43,9 @@ module Omnibus
 
     def pretty_version_map(project)
       out = ""
-      version_map = Omnibus.library.version_map(project)
+      version_map = project.library.version_map
+
 
-      
       # Pull out data to print out
       versions = non_nil_values(version_map.values, :version)
       guids = non_nil_values(version_map.values, :version_guid)
@@ -55,7 +55,7 @@ module Omnibus
       # overridden, but nothing if no packages were changed
       overridden_versions = non_nil_values(version_map.values.select{|v| v[:overridden]},
                                            :given_version)
-  
+
 
       # Determine how wide the printed table columns need to be
       name_width = column_width(version_map.keys, "Component")
@@ -65,7 +65,7 @@ module Omnibus
 
       total_width = name_width + version_width + guid_width + override_width
       divider = "-" * total_width
-      
+
       # Print out the column headers
       out << "Component".ljust(name_width)
       out << "Installed Version".ljust(version_width)

data/lib/omnibus/software.rb

@@ -89,7 +89,7 @@ module Omnibus
 
       # Set override information after the DSL file has been consumed
       @override_version = overrides[name]
-      
+
       render_tasks
     end
 
@@ -233,7 +233,7 @@ module Omnibus
     #
     # @return [String] an absolute filesystem path
     def build_dir
-      "#{config.build_dir}/#{camel_case_path(install_dir)}"
+      "#{config.build_dir}/#{@project.name}"
     end
 
     # @todo Why the different name (i.e. *_dir instead of *_path, or
@@ -368,7 +368,7 @@ module Omnibus
         #
         (@dependencies - [@name]).uniq.each do |dep|
           task @name => dep
-          file manifest_file => manifest_file_from_name(dep)  
+          file manifest_file => manifest_file_from_name(dep)
         end
 
         directory source_dir
@@ -395,8 +395,8 @@ module Omnibus
                 end
               end
 
-            else 
-              # if fetch has occurred, or the component is configured to 
+            else
+              # if fetch has occurred, or the component is configured to
               # always build, do a clean and build.
               execute_build(fetcher)
             end
@@ -414,7 +414,7 @@ module Omnibus
 
         file manifest_file => (file latest_file)
 
-        file fetch_file => "#{name}:fetch" 
+        file fetch_file => "#{name}:fetch"
         file manifest_file => "#{name}:build"
 
         file fetch_file => (file @source_config)

data/lib/omnibus/version.rb

@@ -16,5 +16,5 @@
 #
 
 module Omnibus
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

data/omnibus.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "mixlib-config", "~> 1.1.2"
   gem.add_dependency "ohai", ">= 0.6.12"
   gem.add_dependency "rake", ">= 0.9"
-  gem.add_dependency "fpm", "= 0.3.11"
+  gem.add_dependency "fpm", "~> 0.4.33"
   gem.add_dependency "uber-s3"
   gem.add_dependency "thor", ">= 0.16.0"
 

data/spec/artifact_spec.rb

@@ -0,0 +1,106 @@
+#
+# Copyright:: Copyright (c) 2012 Opscode, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'omnibus/artifact'
+require 'spec_helper'
+
+describe Omnibus::Artifact do
+
+  let(:path) { "build_os=centos-5,machine_architecture=x86,role=oss-builder/pkg/demoproject-11.4.0-1.el5.x86_64.rpm" }
+
+  let(:content) { StringIO.new("this is the package content\n") }
+
+  let(:md5) { "d41d8cd98f00b204e9800998ecf8427e" }
+
+  let(:sha256) { "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" }
+
+  let(:platforms) { [ [ "el", "5", "x86_64" ], [ "sles","11.2","x86_64" ] ] }
+
+  let(:artifact) { Omnibus::Artifact.new(path, platforms, { :version => "11.4.0-1" }) }
+
+  it "has the path to the package" do
+    artifact.path.should == path
+  end
+
+  it "has a list of platforms the package supports" do
+    artifact.platforms.should == platforms
+  end
+
+  it "generates a MD5 of an artifact" do
+    File.should_receive(:open).with(path).and_return(content)
+    artifact.md5.should == md5
+  end
+
+  it "generates a SHA256 of an artifact" do
+    File.should_receive(:open).with(path).and_return(content)
+    artifact.sha256.should == sha256
+  end
+
+  it "generates 'flat' metadata" do
+    File.should_receive(:open).twice.with(path).and_return(content)
+    flat_metadata = artifact.flat_metadata
+    flat_metadata["platform"].should == "el"
+    flat_metadata["platform_version"].should == "5"
+    flat_metadata["arch"].should == "x86_64"
+    flat_metadata["version"].should == "11.4.0-1"
+    flat_metadata["basename"].should == "demoproject-11.4.0-1.el5.x86_64.rpm"
+    flat_metadata["md5"].should == md5
+    flat_metadata["sha256"].should == sha256
+  end
+
+  it "adds the package to a release manifest" do
+    expected = {
+      "el" => {
+        "5" => { "x86_64" => { "11.4.0-1" => "/el/5/x86_64/demoproject-11.4.0-1.el5.x86_64.rpm" } }
+      },
+      "sles" => {
+        "11.2" => { "x86_64" => { "11.4.0-1" => "/el/5/x86_64/demoproject-11.4.0-1.el5.x86_64.rpm" } }
+      }
+    }
+
+    manifest = artifact.add_to_release_manifest!({})
+    manifest.should == expected
+  end
+
+  it "adds the package to a v2 release manifest" do
+    File.should_receive(:open).with(path).twice.and_return(content)
+    expected = {
+      "el" => {
+        "5" => { "x86_64" => { "11.4.0-1" => {
+          "relpath" => "/el/5/x86_64/demoproject-11.4.0-1.el5.x86_64.rpm",
+          "md5" => md5,
+          "sha256" => sha256
+            }
+          }
+        }
+      },
+      "sles" => {
+        "11.2" => { "x86_64" => { "11.4.0-1" => {
+          "relpath" => "/el/5/x86_64/demoproject-11.4.0-1.el5.x86_64.rpm",
+          "md5" => md5,
+          "sha256" => sha256
+            }
+          }
+        }
+      }
+    }
+    v2_manifest = artifact.add_to_v2_release_manifest!({})
+    v2_manifest.should == expected
+  end
+
+end
+

data/spec/package_release_spec.rb

@@ -0,0 +1,197 @@
+#
+# Copyright:: Copyright (c) 2012 Opscode, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'omnibus/package_release'
+require 'spec_helper'
+
+describe Omnibus::PackageRelease do
+  let(:s3_key) { "s3key" }
+  let(:s3_secret) { "hey-bezos-store-my-stuff" }
+  let(:s3_bucket) { "myorg-omnibus-packages" }
+  let(:pkg_path) { "pkg/chef_11.4.0-183-g2c0040c-0.el6.x86_64.rpm" }
+  let(:pkg_metadata_path) { "#{pkg_path}.metadata.json" }
+
+  let(:config) do
+    {
+      :release_s3_access_key => s3_key,
+      :release_s3_secret_key => s3_secret,
+      :release_s3_bucket => s3_bucket
+    }
+  end
+  subject(:package_release) do
+    Omnibus::PackageRelease.new(pkg_path)
+  end
+
+  it "has a package path" do
+    package_release.package_path.should == pkg_path
+  end
+
+  it "defaults to `:private' access policy" do
+    package_release.access_policy.should == :private
+  end
+
+  describe "validating configuration" do
+
+    before do
+      Omnibus.stub!(:config).and_return(config)
+    end
+
+    it "validates that the s3 key is set" do
+      config.delete(:release_s3_access_key)
+      lambda { package_release.validate_config! }.should raise_error(Omnibus::InvalidS3ReleaseConfiguration)
+    end
+
+    it "validates that the s3 secret key is set" do
+      config.delete(:release_s3_secret_key)
+      lambda { package_release.validate_config! }.should raise_error(Omnibus::InvalidS3ReleaseConfiguration)
+    end
+
+    it "validates that the s3 bucket is set" do
+      config.delete(:release_s3_bucket)
+      lambda { package_release.validate_config! }.should raise_error(Omnibus::InvalidS3ReleaseConfiguration)
+    end
+
+    it "does not error on a valid configuration" do
+      lambda { package_release.validate_config! }.should_not raise_error
+    end
+  end
+
+  describe "validating package for upload" do
+    it "ensures that the package file exists" do
+      lambda { package_release.validate_package! }.should raise_error(Omnibus::NoPackageFile)
+    end
+
+    it "ensures that there is a metadata file for the package" do
+      File.should_receive(:exist?).with(pkg_path).and_return(true)
+      File.should_receive(:exist?).with(pkg_metadata_path).and_return(false)
+      lambda { package_release.validate_package! }.should raise_error(Omnibus::NoPackageMetadataFile)
+    end
+  end
+
+  context "with a valid config and package" do
+
+    let(:basename) { "chef_11.4.0-183-g2c0040c-0.el6.x86_64.rpm" }
+    let(:md5) { "016f2e0854c69901b3f0ad8f99ffdb75" }
+    let(:platform_path) { "el/6/x86_64" }
+    let(:pkg_content) { "expected package content" }
+
+    let(:metadata_json) do
+      <<-E
+{
+  "platform": "el",
+  "platform_version": "6",
+  "arch": "x86_64",
+  "version": "11.4.0-183-g2c0040c",
+  "basename": "#{basename}",
+  "md5": "#{md5}",
+  "sha256": "21191ab698d1663a5e738e470fad16a2c6efee05ed597002f2e846ec80ade38c"
+}
+      E
+    end
+
+    before do
+      package_release.stub!(:config).and_return(config)
+      File.stub(:exist?).with(pkg_metadata_path).and_return(true)
+      File.stub(:exist?).with(pkg_path).and_return(true)
+      IO.stub(:read).with(pkg_metadata_path).and_return(metadata_json)
+      IO.stub(:read).with(pkg_path).and_return(pkg_content)
+    end
+
+    it "configures s3 with the given credentials" do
+      expected_s3_config = {
+        :access_key         => s3_key,
+        :secret_access_key  => s3_secret,
+        :bucket             => s3_bucket,
+        :adaper             => :net_http
+      }
+      UberS3.should_receive(:new).with(expected_s3_config)
+      package_release.s3_client
+    end
+
+    it "generates the relative path for the package s3 key" do
+      package_release.platform_path.should == platform_path
+    end
+
+
+    it "uploads the package and metadata" do
+      package_release.s3_client.should_receive(:store).with(
+        "#{platform_path}/#{basename}.metadata.json",
+        metadata_json,
+        :access => :private
+      )
+      package_release.s3_client.should_receive(:store).with(
+        "#{platform_path}/#{basename}",
+        pkg_content,
+        :access => :private,
+        :content_md5 => md5
+      )
+      package_release.release
+    end
+
+    context "and a callback is given for after upload" do
+      let(:upload_records) { [] }
+
+      subject(:package_release) do
+        Omnibus::PackageRelease.new(pkg_path) do |uploaded|
+          upload_records << uploaded
+        end
+      end
+
+      it "fires the after_upload callback for each item uploaded" do
+        package_release.s3_client.should_receive(:store).with(
+          "#{platform_path}/#{basename}.metadata.json",
+          metadata_json,
+          :access => :private
+        )
+        package_release.s3_client.should_receive(:store).with(
+          "#{platform_path}/#{basename}",
+          pkg_content,
+          :access => :private,
+          :content_md5 => md5
+        )
+        package_release.release
+
+        upload_records.should == [ "#{platform_path}/#{basename}.metadata.json",
+                                   "#{platform_path}/#{basename}" ]
+      end
+    end
+
+    context "and the package is public" do
+
+      subject(:package_release) do
+        Omnibus::PackageRelease.new(pkg_path, :access => :public_read)
+      end
+
+      it "uploads the package and metadata" do
+        package_release.s3_client.should_receive(:store).with(
+          "#{platform_path}/#{basename}.metadata.json",
+          metadata_json,
+          :access => :public_read
+        )
+        package_release.s3_client.should_receive(:store).with(
+          "#{platform_path}/#{basename}",
+          pkg_content,
+          :access => :public_read,
+          :content_md5 => md5
+        )
+        package_release.release
+      end
+    end
+
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omnibus
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Opscode
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-02 00:00:00.000000000 Z
+date: 2013-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -70,16 +70,16 @@ dependencies:
   name: fpm
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.11
+        version: 0.4.33
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.11
+        version: 0.4.33
 - !ruby/object:Gem::Dependency
   name: uber-s3
   requirement: !ruby/object:Gem::Requirement
@@ -157,6 +157,7 @@ files:
 - bin/makeself.sh
 - bin/omnibus
 - lib/omnibus.rb
+- lib/omnibus/artifact.rb
 - lib/omnibus/build_version.rb
 - lib/omnibus/builder.rb
 - lib/omnibus/clean_tasks.rb
@@ -165,6 +166,7 @@ files:
 - lib/omnibus/cli/base.rb
 - lib/omnibus/cli/build.rb
 - lib/omnibus/cli/cache.rb
+- lib/omnibus/cli/release.rb
 - lib/omnibus/config.rb
 - lib/omnibus/exceptions.rb
 - lib/omnibus/fetcher.rb
@@ -176,6 +178,7 @@ files:
 - lib/omnibus/health_check.rb
 - lib/omnibus/library.rb
 - lib/omnibus/overrides.rb
+- lib/omnibus/package_release.rb
 - lib/omnibus/project.rb
 - lib/omnibus/reports.rb
 - lib/omnibus/s3_cacher.rb
@@ -196,6 +199,7 @@ files:
 - lib/omnibus/util.rb
 - lib/omnibus/version.rb
 - omnibus.gemspec
+- spec/artifact_spec.rb
 - spec/build_version_spec.rb
 - spec/data/overrides/bad_line.overrides
 - spec/data/overrides/good.overrides
@@ -203,6 +207,7 @@ files:
 - spec/data/software/erchef.rb
 - spec/fetchers/net_fetcher_spec.rb
 - spec/overrides_spec.rb
+- spec/package_release_spec.rb
 - spec/software_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/opscode/omnibus-ruby
@@ -230,6 +235,7 @@ signing_key:
 specification_version: 4
 summary: Omnibus helps you build self-installing, full-stack software builds.
 test_files:
+- spec/artifact_spec.rb
 - spec/build_version_spec.rb
 - spec/data/overrides/bad_line.overrides
 - spec/data/overrides/good.overrides
@@ -237,6 +243,7 @@ test_files:
 - spec/data/software/erchef.rb
 - spec/fetchers/net_fetcher_spec.rb
 - spec/overrides_spec.rb
+- spec/package_release_spec.rb
 - spec/software_spec.rb
 - spec/spec_helper.rb
 has_rdoc: