omnibus 1.3.0 → 2.0.0.rc1

data/lib/omnibus.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) 2012 Opscode, Inc.
+# Copyright:: Copyright (c) 2012-2014 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -38,7 +38,6 @@ require 'omnibus/version'
 require 'pathname'
 
 module Omnibus
-
   DEFAULT_CONFIG_FILENAME = 'omnibus.rb'.freeze
 
   # Configure Omnibus.
@@ -71,7 +70,7 @@ module Omnibus
   # @param file [String] path to a configuration file to load
   #
   # @return [void]
-  def self.load_configuration(file=nil)
+  def self.load_configuration(file = nil)
     if file
       Config.from_file(file)
     end
@@ -98,7 +97,7 @@ module Omnibus
   #
   # @return [Array<String>]
   def self.project_names
-    projects.map{|p| p.name}
+    projects.map { |p| p.name }
   end
 
   # Load the {Omnibus::Project} instance with the given name.
@@ -106,7 +105,7 @@ module Omnibus
   # @param name [String]
   # @return {Omnibus::Project}
   def self.project(name)
-    projects.find{ |p| p.name == name}
+    projects.find { |p| p.name == name }
   end
 
   # The absolute path to the Omnibus project/repository directory.
@@ -123,7 +122,7 @@ module Omnibus
   #
   # @return [Pathname]
   def self.source_root
-    @source_root ||= Pathname.new(File.expand_path("../..", __FILE__))
+    @source_root ||= Pathname.new(File.expand_path('../..', __FILE__))
   end
 
   # The source root is the path to the root directory of the `omnibus-software`
@@ -132,7 +131,7 @@ module Omnibus
   # @return [Pathname]
   def self.omnibus_software_root
     @omnibus_software_root ||= begin
-      if spec = Gem::Specification.find_all_by_name('omnibus-software').first
+      if (spec = Gem::Specification.find_all_by_name(Config.software_gem).first)
         Pathname.new(spec.gem_dir)
       else
         nil
@@ -169,7 +168,7 @@ module Omnibus
   #
   # @todo print a deprecation message
   class << self
-    alias :root :project_root
+    alias_method :root, :project_root
   end
 
   private
@@ -197,7 +196,7 @@ module Omnibus
   # @see Omnibus::Overrides#overrides
   def self.expand_software(overrides, software_map)
     unless overrides.is_a? Hash
-      raise ArgumentError, "Overrides argument must be a hash!  You passed #{overrides.inspect}."
+      fail ArgumentError, "Overrides argument must be a hash!  You passed #{overrides.inspect}."
     end
 
     Omnibus.projects.each do |project|
@@ -216,8 +215,7 @@ module Omnibus
     expand_projects
 
     # Then do software
-    final_software_map = prefer_local_software(omnibus_software_files,
-                                           software_files)
+    final_software_map = prefer_local_software(omnibus_software_files, software_files)
 
     overrides = Config.override_file ? Omnibus::Overrides.overrides : {}
 
@@ -281,7 +279,7 @@ module Omnibus
   # @return [Hash<String, String>]
   def self.software_map(files)
     files.each_with_object({}) do |file, collection|
-      software_name = File.basename(file, ".*")
+      software_name = File.basename(file, '.*')
       collection[software_name] = file
     end
   end
@@ -299,7 +297,7 @@ module Omnibus
     dep_file = software_map[dependency_name]
 
     unless dep_file
-      raise MissingProjectDependency.new(dependency_name, software_dirs)
+      fail MissingProjectDependency.new(dependency_name, software_dirs)
     end
 
     dep_software = Omnibus::Software.load(dep_file, project, overrides)

data/omnibus.gemspec

@@ -4,31 +4,33 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'omnibus/version'
 
 Gem::Specification.new do |gem|
-  gem.name           = "omnibus"
+  gem.name           = 'omnibus'
   gem.version        = Omnibus::VERSION
-  gem.license        = "Apache 2.0"
-  gem.author         = "Opscode"
-  gem.email          = "info@opscode.com"
-  gem.description    = "Omnibus helps you build self-installing, full-stack software builds."
+  gem.license        = 'Apache 2.0'
+  gem.author         = 'Chef Software, Inc.'
+  gem.email          = 'info@getchef.com'
+  gem.description    = 'Omnibus helps you build self-installing, full-stack software builds.'
   gem.summary        = gem.description
-  gem.homepage       = "https://github.com/opscode/omnibus-ruby"
+  gem.homepage       = 'https://github.com/opscode/omnibus-ruby'
 
-  gem.required_ruby_version = ">= 1.9.1"
+  gem.required_ruby_version = '>= 1.9.1'
 
   gem.files = `git ls-files`.split($/)
-  gem.bindir = "bin"
+  gem.bindir = 'bin'
   gem.executables = %w(omnibus)
   gem.test_files = gem.files.grep(%r{^(test|spec|features)/})
-  gem.require_paths = ["lib"]
+  gem.require_paths = ['lib']
 
-  gem.add_dependency "mixlib-shellout", "~> 1.3.0"
-  gem.add_dependency "mixlib-config", "~> 2.1.0"
-  gem.add_dependency "ohai", ">= 0.6.12"
-  gem.add_dependency "rake", ">= 0.9"
-  gem.add_dependency "fpm", "~> 1.0.0"
-  gem.add_dependency "uber-s3"
-  gem.add_dependency "thor", ">= 0.16.0"
+  gem.add_dependency 'mixlib-shellout', '~> 1.3'
+  gem.add_dependency 'mixlib-config',   '~> 2.1'
+  gem.add_dependency 'ohai',            '~> 6.12'
+  gem.add_dependency 'rake'
+  gem.add_dependency 'fpm',             '~> 1.0.0'
+  gem.add_dependency 'uber-s3'
+  gem.add_dependency 'thor',            '>= 0.16.0'
 
-  gem.add_development_dependency "rspec"
-  gem.add_development_dependency "rspec_junit_formatter"
+  gem.add_development_dependency 'rspec',   '~> 2.14'
+  gem.add_development_dependency 'rubocop', '~> 0.18'
+
+  gem.add_development_dependency 'bundler'
 end

data/spec/artifact_spec.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) 2012 Opscode, Inc.
+# Copyright:: Copyright (c) 2012-2014 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -20,87 +20,90 @@ 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(: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(:md5) { 'd41d8cd98f00b204e9800998ecf8427e' }
 
-  let(:sha256) { "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" }
+  let(:sha256) { 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855' }
 
-  let(:platforms) { [ [ "el", "5", "x86_64" ], [ "sles","11.2","x86_64" ] ] }
+  let(:platforms) { [%w(el 5 x86_64), ['sles', '11.2', 'x86_64']] }
 
-  let(:artifact) { Omnibus::Artifact.new(path, platforms, { :version => "11.4.0-1" }) }
+  let(:artifact) { Omnibus::Artifact.new(path, platforms,  version: '11.4.0-1') }
 
-  it "has the path to the package" do
-    artifact.path.should == path
+  it 'has the path to the package' do
+    expect(artifact.path).to eq(path)
   end
 
-  it "has a list of platforms the package supports" do
-    artifact.platforms.should == platforms
+  it 'has a list of platforms the package supports' do
+    expect(artifact.platforms).to eq(platforms)
   end
 
-  it "generates a MD5 of an artifact" do
-    File.should_receive(:open).with(path).and_return(content)
-    artifact.md5.should == md5
+  it 'generates a MD5 of an artifact' do
+    expect(File).to receive(:open).with(path).and_return(content)
+    expect(artifact.md5).to eq(md5)
   end
 
-  it "generates a SHA256 of an artifact" do
-    File.should_receive(:open).with(path).and_return(content)
-    artifact.sha256.should == sha256
+  it 'generates a SHA256 of an artifact' do
+    expect(File).to receive(:open).with(path).and_return(content)
+    expect(artifact.sha256).to eq(sha256)
   end
 
   it "generates 'flat' metadata" do
-    File.should_receive(:open).twice.with(path).and_return(content)
+    expect(File).to 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
+    expect(flat_metadata['platform']).to eq('el')
+    expect(flat_metadata['platform_version']).to eq('5')
+    expect(flat_metadata['arch']).to eq('x86_64')
+    expect(flat_metadata['version']).to eq('11.4.0-1')
+    expect(flat_metadata['basename']).to eq('demoproject-11.4.0-1.el5.x86_64.rpm')
+    expect(flat_metadata['md5']).to eq(md5)
+    expect(flat_metadata['sha256']).to eq(sha256)
   end
 
-  it "adds the package to a release manifest" do
+  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" } }
+      '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' } },
       },
-      "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
+    expect(manifest).to eq(expected)
   end
 
-  it "adds the package to a v2 release manifest" do
-    File.should_receive(:open).with(path).twice.and_return(content)
+  it 'adds the package to a v2 release manifest' do
+    expect(File).to 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
-            }
-          }
-        }
+      '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,
+            },
+          },
+        },
       },
-      "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
+    expect(v2_manifest).to eq(expected)
   end
 
 end
-