omnibus 3.2.0.rc.3 → 3.2.0

data/lib/omnibus/publishers/artifactory_publisher.rb

@@ -118,7 +118,7 @@ module Omnibus
     # and the package metadata.
     #
     # @example
-    #   com/getchef/chef/11.6.0/chef-11.6.0-1.el6.x86_64.rpm
+    #   chef/11.6.0/chef-11.6.0-1.el6.x86_64.rpm
     #
     # @param [Package] package
     #   the package to generate the remote path for
@@ -126,16 +126,8 @@ module Omnibus
     # @return [String]
     #
     def remote_path_for(package)
-      unless package.metadata[:homepage]
-        raise OldMetadata.new(package.metadata.path)
-      end
-
-      domain_parts = parsed_uri_for(package).host.split('.')
-      domain_parts.delete('www')
-      domain_parts.reverse!
-
       File.join(
-        *domain_parts,
+        Config.artifactory_base_path,
         package.metadata[:name],
         package.metadata[:version],
         package.metadata[:platform],
@@ -143,29 +135,5 @@ module Omnibus
         package.metadata[:basename],
       )
     end
-
-    #
-    # The parsed domain for this package. Ruby's URI parser does not "assume"
-    # a valid protocol, so passing a URI like "CHANGEME.org" will essentially
-    # result in an unsable object that has no useful, extractable information.
-    #
-    # This method will essentially "force" a default protocol on the +homepage+
-    # attribute of the package, so that it can be parsed like a good little URI.
-    #
-    # @param [Package] package
-    #   the package to generate the remote path for
-    #
-    # @return [URI]
-    #   the parsed URI object
-    #
-    def parsed_uri_for(package)
-      raw = package.metadata[:homepage]
-
-      if raw =~ /\Ahttps?:\/\//
-        URI.parse(raw)
-      else
-        URI.parse("http://#{raw}")
-      end
-    end
   end
 end

data/lib/omnibus/util.rb

@@ -98,23 +98,5 @@ module Omnibus
     def falsey?(value)
       value && value.to_s =~ /^(false|f|no|n|0)$/i
     end
-
-    #
-    # Convert the given path to be appropiate for shelling out on Windows.
-    #
-    # @param [Array<String>] pieces
-    #   the pieces of the path to join and fix
-    # @return [String]
-    #   the path with applied changes
-    #
-    def windows_safe_path(*pieces)
-      path = File.join(*pieces)
-
-      if File::ALT_SEPARATOR
-        path.gsub(File::SEPARATOR, File::ALT_SEPARATOR)
-      else
-        path
-      end
-    end
   end
 end

data/lib/omnibus/version.rb

@@ -15,5 +15,5 @@
 #
 
 module Omnibus
-  VERSION = '3.2.0.rc.3'
+  VERSION = '3.2.0'
 end

data/omnibus.gemspec

@@ -8,10 +8,10 @@ Gem::Specification.new do |gem|
   gem.version        = Omnibus::VERSION
   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.email          = 'releng@getchef.com'
+  gem.summary        = 'Omnibus is a framework for building self-installing, full-stack software builds.'
+  gem.description    = gem.summary
+  gem.homepage       = 'https://github.com/opscode/omnibus'
 
   gem.required_ruby_version = '>= 1.9.1'
 
@@ -23,7 +23,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'chef-sugar',      '~> 1.2'
   gem.add_dependency 'mixlib-shellout', '~> 1.4'
-  gem.add_dependency 'ohai',            '~> 7.2.0.rc'
+  gem.add_dependency 'ohai',            '~> 7.2'
   gem.add_dependency 'fpm',             '~> 0.4'
   gem.add_dependency 'uber-s3'
   gem.add_dependency 'thor',            '~> 0.18'

data/spec/data/complicated/config/projects/chef-windows.rb

@@ -22,7 +22,7 @@ homepage "http://www.opscode.com"
 # NOTE: Ruby DevKit fundamentally CANNOT be installed into "Program Files"
 #       Native gems will use gcc which will barf on files with spaces,
 #       which is only fixable if everyone in the world fixes their Makefiles
-install_dir    "c:\\opscode\\chef"
+install_dir    "C:/opscode/chef"
 build_version   '1.0.0'
 build_iteration 4
 package_name    "chef-client"

data/spec/data/complicated/config/projects/chefdk-windows.rb

@@ -22,7 +22,7 @@ homepage "http://www.opscode.com"
 # NOTE: Ruby DevKit fundamentally CANNOT be installed into "Program Files"
 #       Native gems will use gcc which will barf on files with spaces,
 #       which is only fixable if everyone in the world fixes their Makefiles
-install_dir     "c:\\opscode\\chefdk"
+install_dir     "C:/opscode/chefdk"
 build_version   '1.0.0'
 build_iteration 1
 

data/spec/data/complicated/config/software/cacerts.rb

@@ -27,10 +27,10 @@ build do
   block do
     FileUtils.mkdir_p(File.expand_path("embedded/ssl/certs", install_dir))
 
-    # There is a bug in omnibus-ruby that may or may not have been fixed. Since the source url
-    # does not point to an archive, omnibus-ruby tries to copy cacert.pem into the project working
+    # There is a bug in omnibus that may or may not have been fixed. Since the source url
+    # does not point to an archive, omnibus tries to copy cacert.pem into the project working
     # directory. However, it fails and copies to '/var/cache/omnibus/src/cacerts-2012.12.19\' instead
-    # There is supposed to be a fix in omnibus-ruby, but under further testing, it was unsure if the
+    # There is supposed to be a fix in omnibus, but under further testing, it was unsure if the
     # fix worked. Rather than trying to fix this now, we're filing a bug and copying the cacert.pem
     # directly from the cache instead.
 

data/spec/data/complicated/config/software/chef-client-msi.rb

@@ -45,8 +45,7 @@ build do
       @build_version = build_version.split("-")[1] || self.project.build_iteration
 
       # Find path in which chef gem is installed to.
-      # Note that install_dir is something like: c:\\opscode\\chef
-      chef_path_regex = "#{install_dir.gsub(File::ALT_SEPARATOR, File::SEPARATOR)}/**/gems/chef-[0-9]*"
+      chef_path_regex = "#{install_dir}/**/gems/chef-[0-9]*"
       chef_gem_paths = Dir[chef_path_regex].select{ |path| File.directory?(path) }
       raise "Expected one but found #{chef_gem_paths.length} installation directories for chef gem using: #{chef_path_regex}. Found paths: #{chef_gem_paths.inspect}." unless chef_gem_paths.length == 1
       @chef_gem_path = chef_gem_paths.first

data/spec/data/complicated/config/software/chef-windows.rb

@@ -36,11 +36,11 @@ build do
   #
   #####################################################################
   #
-  # since omnibus-ruby is not architected to intentionally let the
+  # since omnibus is not architected to intentionally let the
   # software definitions define the #build_version and
   # #build_iteration of the package artifact, we're going to implement
   # a temporary hack here that lets us do so. this type of use case
-  # will become a feature of omnibus-ruby in the future, but in order
+  # will become a feature of omnibus in the future, but in order
   # to get things shipped, we'll hack it up here.
   #
   # <3 Stephen

data/spec/data/complicated/config/software/chef.rb

@@ -57,11 +57,11 @@ build do
   #
   #####################################################################
   #
-  # since omnibus-ruby is not architected to intentionally let the
+  # since omnibus is not architected to intentionally let the
   # software definitions define the #build_version and
   # #build_iteration of the package artifact, we're going to implement
   # a temporary hack here that lets us do so. this type of use case
-  # will become a feature of omnibus-ruby in the future, but in order
+  # will become a feature of omnibus in the future, but in order
   # to get things shipped, we'll hack it up here.
   #
   # <3 Stephen

data/spec/data/complicated/config/software/chefdk.rb

@@ -48,7 +48,7 @@ env = {
 
 build do
   # Nasty hack to set the artifact version until this gets fixed:
-  # https://github.com/opscode/omnibus-ruby/issues/134
+  # https://github.com/opscode/omnibus/issues/134
   block do
     project = self.project
     if project.name == "chefdk"

data/spec/data/complicated/config/software/openssl.rb

@@ -140,7 +140,7 @@ build do
   # openssl build process uses a `makedepend` tool that we build inside the bundle.
   env["PATH"] = "#{install_dir}/embedded/bin" + File::PATH_SEPARATOR + ENV["PATH"]
 
-  # @todo: move into omnibus-ruby
+  # @todo: move into omnibus
   has_gmake = system("gmake --version")
 
   if has_gmake

data/spec/data/complicated/config/software/ruby.rb

@@ -146,7 +146,7 @@ build do
     "GEM_HOME"        => nil
   })
 
-  # @todo: move into omnibus-ruby
+  # @todo: move into omnibus
   has_gmake = system("gmake --version")
 
   if has_gmake

data/spec/functional/builder_spec.rb

@@ -237,6 +237,16 @@ module Omnibus
 
         expect(File.file?(path)).to be_truthy
       end
+
+      it 'creates the containing directory' do
+        path = File.join(tmp_path, 'foo', 'bar', 'file')
+        FileUtils.rm_rf(path)
+
+        subject.touch(path)
+        subject.build
+
+        expect(File.file?(path)).to be_truthy
+      end
     end
 
     describe '#delete' do
@@ -259,6 +269,19 @@ module Omnibus
 
         expect(File.exist?(path)).to be_falsey
       end
+
+      it 'accepts a glob pattern' do
+        path_a = File.join(tmp_path, 'file_a')
+        path_b = File.join(tmp_path, 'file_b')
+        FileUtils.touch(path_a)
+        FileUtils.touch(path_b)
+
+        subject.delete("#{tmp_path}/**/file_*")
+        subject.build
+
+        expect(File.exist?(path_a)).to be_falsey
+        expect(File.exist?(path_b)).to be_falsey
+      end
     end
 
     describe '#copy' do
@@ -273,6 +296,45 @@ module Omnibus
         expect(File.file?(path_b)).to be_truthy
         expect(File.read(path_b)).to eq(File.read(path_a))
       end
+
+      it 'copies the directory and entries' do
+        destination = File.join(tmp_path, 'destination')
+
+        directory = File.join(tmp_path, 'scratch')
+        FileUtils.mkdir_p(directory)
+
+        path_a = File.join(directory, 'file_a')
+        path_b = File.join(directory, 'file_b')
+        FileUtils.touch(path_a)
+        FileUtils.touch(path_b)
+
+        subject.copy(directory, destination)
+        subject.build
+
+        expect(File.exist?(destination)).to be_truthy
+        expect(File.exist?("#{destination}/file_a")).to be_truthy
+        expect(File.exist?("#{destination}/file_b")).to be_truthy
+      end
+
+      it 'accepts a glob pattern' do
+        destination = File.join(tmp_path, 'destination')
+        FileUtils.mkdir_p(destination)
+
+        directory = File.join(tmp_path, 'scratch')
+        FileUtils.mkdir_p(directory)
+
+        path_a = File.join(directory, 'file_a')
+        path_b = File.join(directory, 'file_b')
+        FileUtils.touch(path_a)
+        FileUtils.touch(path_b)
+
+        subject.copy("#{directory}/*", destination)
+        subject.build
+
+        expect(File.exist?(destination)).to be_truthy
+        expect(File.exist?("#{destination}/file_a")).to be_truthy
+        expect(File.exist?("#{destination}/file_b")).to be_truthy
+      end
     end
 
     describe '#move' do
@@ -287,6 +349,49 @@ module Omnibus
         expect(File.file?(path_b)).to be_truthy
         expect(File.file?(path_a)).to be_falsey
       end
+
+      it 'moves the directory and entries' do
+        destination = File.join(tmp_path, 'destination')
+
+        directory = File.join(tmp_path, 'scratch')
+        FileUtils.mkdir_p(directory)
+
+        path_a = File.join(directory, 'file_a')
+        path_b = File.join(directory, 'file_b')
+        FileUtils.touch(path_a)
+        FileUtils.touch(path_b)
+
+        subject.move(directory, destination)
+        subject.build
+
+        expect(File.exist?(destination)).to be_truthy
+        expect(File.exist?("#{destination}/file_a")).to be_truthy
+        expect(File.exist?("#{destination}/file_b")).to be_truthy
+
+        expect(File.exist?(directory)).to be_falsey
+      end
+
+      it 'accepts a glob pattern' do
+        destination = File.join(tmp_path, 'destination')
+        FileUtils.mkdir_p(destination)
+
+        directory = File.join(tmp_path, 'scratch')
+        FileUtils.mkdir_p(directory)
+
+        path_a = File.join(directory, 'file_a')
+        path_b = File.join(directory, 'file_b')
+        FileUtils.touch(path_a)
+        FileUtils.touch(path_b)
+
+        subject.move("#{directory}/*", destination)
+        subject.build
+
+        expect(File.exist?(destination)).to be_truthy
+        expect(File.exist?("#{destination}/file_a")).to be_truthy
+        expect(File.exist?("#{destination}/file_b")).to be_truthy
+
+        expect(File.exist?(directory)).to be_truthy
+      end
     end
 
     describe '#link' do
@@ -300,6 +405,139 @@ module Omnibus
 
         expect(File.symlink?(path_b)).to be_truthy
       end
+
+      it 'links the directory' do
+        destination = File.join(tmp_path, 'destination')
+        directory = File.join(tmp_path, 'scratch')
+        FileUtils.mkdir_p(directory)
+
+        subject.link(directory, destination)
+        subject.build
+
+        expect(File.symlink?(destination)).to be_truthy
+      end
+
+      it 'accepts a glob pattern' do
+        destination = File.join(tmp_path, 'destination')
+        FileUtils.mkdir_p(destination)
+
+        directory = File.join(tmp_path, 'scratch')
+        FileUtils.mkdir_p(directory)
+
+        path_a = File.join(directory, 'file_a')
+        path_b = File.join(directory, 'file_b')
+        FileUtils.touch(path_a)
+        FileUtils.touch(path_b)
+
+        subject.link("#{directory}/*", destination)
+        subject.build
+
+        expect(File.symlink?("#{destination}/file_a")).to be_truthy
+        expect(File.symlink?("#{destination}/file_b")).to be_truthy
+      end
+    end
+
+    describe '#sync' do
+      let(:source) do
+        source = File.join(tmp_path, 'source')
+        FileUtils.mkdir_p(source)
+
+        FileUtils.touch(File.join(source, 'file_a'))
+        FileUtils.touch(File.join(source, 'file_b'))
+        FileUtils.touch(File.join(source, 'file_c'))
+
+        FileUtils.mkdir_p(File.join(source, 'folder'))
+        FileUtils.touch(File.join(source, 'folder', 'file_d'))
+        FileUtils.touch(File.join(source, 'folder', 'file_e'))
+
+        FileUtils.mkdir_p(File.join(source, '.dot_folder'))
+        FileUtils.touch(File.join(source, '.dot_folder', 'file_f'))
+
+        FileUtils.touch(File.join(source, '.file_g'))
+        source
+      end
+
+      let(:destination) { File.join(tmp_path, 'destination') }
+
+      context 'when the destination is empty' do
+        it 'syncs the directories' do
+          subject.sync(source, destination)
+          subject.build
+
+          expect(File.file?("#{destination}/file_a")).to be_truthy
+          expect(File.file?("#{destination}/file_b")).to be_truthy
+          expect(File.file?("#{destination}/file_c")).to be_truthy
+          expect(File.file?("#{destination}/folder/file_d")).to be_truthy
+          expect(File.file?("#{destination}/folder/file_e")).to be_truthy
+          expect(File.file?("#{destination}/.dot_folder/file_f")).to be_truthy
+          expect(File.file?("#{destination}/.file_g")).to be_truthy
+        end
+      end
+
+      context 'when the directory exists' do
+        before { FileUtils.mkdir_p(destination) }
+
+        it 'deletes existing files and folders' do
+          FileUtils.mkdir_p("#{destination}/existing_folder")
+          FileUtils.mkdir_p("#{destination}/.existing_folder")
+          FileUtils.touch("#{destination}/existing_file")
+          FileUtils.touch("#{destination}/.existing_file")
+
+          subject.sync(source, destination)
+          subject.build
+
+          expect(File.file?("#{destination}/file_a")).to be_truthy
+          expect(File.file?("#{destination}/file_b")).to be_truthy
+          expect(File.file?("#{destination}/file_c")).to be_truthy
+          expect(File.file?("#{destination}/folder/file_d")).to be_truthy
+          expect(File.file?("#{destination}/folder/file_e")).to be_truthy
+          expect(File.file?("#{destination}/.dot_folder/file_f")).to be_truthy
+          expect(File.file?("#{destination}/.file_g")).to be_truthy
+
+          expect(File.exist?("#{destination}/existing_folder")).to be_falsey
+          expect(File.exist?("#{destination}/.existing_folder")).to be_falsey
+          expect(File.exist?("#{destination}/existing_file")).to be_falsey
+          expect(File.exist?("#{destination}/.existing_file")).to be_falsey
+        end
+      end
+
+      context 'when :exclude is given' do
+        it 'does not copy files and folders that match the pattern' do
+          subject.sync(source, destination, exclude: '.dot_folder')
+          subject.build
+
+          expect(File.file?("#{destination}/file_a")).to be_truthy
+          expect(File.file?("#{destination}/file_b")).to be_truthy
+          expect(File.file?("#{destination}/file_c")).to be_truthy
+          expect(File.file?("#{destination}/folder/file_d")).to be_truthy
+          expect(File.file?("#{destination}/folder/file_e")).to be_truthy
+          expect(File.exist?("#{destination}/.dot_folder")).to be_falsey
+          expect(File.file?("#{destination}/.dot_folder/file_f")).to be_falsey
+          expect(File.file?("#{destination}/.file_g")).to be_truthy
+        end
+
+        it 'removes existing files and folders in destination' do
+          FileUtils.mkdir_p("#{destination}/existing_folder")
+          FileUtils.touch("#{destination}/existing_file")
+          FileUtils.mkdir_p("#{destination}/.dot_folder")
+          FileUtils.touch("#{destination}/.dot_folder/file_f")
+
+          subject.sync(source, destination, exclude: '.dot_folder')
+          subject.build
+
+          expect(File.file?("#{destination}/file_a")).to be_truthy
+          expect(File.file?("#{destination}/file_b")).to be_truthy
+          expect(File.file?("#{destination}/file_c")).to be_truthy
+          expect(File.file?("#{destination}/folder/file_d")).to be_truthy
+          expect(File.file?("#{destination}/folder/file_e")).to be_truthy
+          expect(File.exist?("#{destination}/.dot_folder")).to be_falsey
+          expect(File.file?("#{destination}/.dot_folder/file_f")).to be_falsey
+          expect(File.file?("#{destination}/.file_g")).to be_truthy
+
+          expect(File.exist?("#{destination}/existing_folder")).to be_falsey
+          expect(File.exist?("#{destination}/existing_file")).to be_falsey
+        end
+      end
     end
   end
 end

data/spec/unit/builder_spec.rb

@@ -39,7 +39,9 @@ module Omnibus
       it_behaves_like 'a cleanroom setter', :copy, %|copy 'file', 'file2'|
       it_behaves_like 'a cleanroom setter', :move, %|move 'file', 'file2'|
       it_behaves_like 'a cleanroom setter', :link, %|link 'file', 'file2'|
+      it_behaves_like 'a cleanroom setter', :sync, %|link 'a/', 'b/'|
       it_behaves_like 'a cleanroom getter', :project_root, %|puts project_root|
+      it_behaves_like 'a cleanroom getter', :windows_safe_path, %|puts windows_safe_path('foo')|
 
       # From software
       it_behaves_like 'a cleanroom getter', :project_dir

data/spec/unit/config_spec.rb

@@ -10,7 +10,7 @@ module Omnibus
 
     before do
       # Don't expand paths on the build system. Otherwise, you will end up with
-      # paths like +\\Users\\you\\Development\\omnibus-ruby\\C:\\omnibus-ruby+
+      # paths like +\\Users\\you\\Development\\omnibus-ruby\\C:/omnibus-ruby+
       # when testing on "other" operating systems
       allow(File).to receive(:expand_path) { |arg| arg }
     end
@@ -57,14 +57,14 @@ module Omnibus
         stub_const('File::ALT_SEPARATOR', '\\')
       end
 
-      include_examples 'a configurable', :base_dir, 'C:\\omnibus-ruby'
-      include_examples 'a configurable', :cache_dir, 'C:\\omnibus-ruby\\cache'
-      include_examples 'a configurable', :git_cache_dir, 'C:\\omnibus-ruby\\cache\\git_cache'
-      include_examples 'a configurable', :install_path_cache_dir, 'C:\\omnibus-ruby\\cache\\git_cache'
-      include_examples 'a configurable', :source_dir, 'C:\\omnibus-ruby\\src'
-      include_examples 'a configurable', :build_dir, 'C:\\omnibus-ruby\\build'
-      include_examples 'a configurable', :package_dir, 'C:\\omnibus-ruby\\pkg'
-      include_examples 'a configurable', :package_tmp, 'C:\\omnibus-ruby\\pkg-tmp'
+      include_examples 'a configurable', :base_dir, 'C:/omnibus-ruby'
+      include_examples 'a configurable', :cache_dir, 'C:/omnibus-ruby/cache'
+      include_examples 'a configurable', :git_cache_dir, 'C:/omnibus-ruby/cache/git_cache'
+      include_examples 'a configurable', :install_path_cache_dir, 'C:/omnibus-ruby/cache/git_cache'
+      include_examples 'a configurable', :source_dir, 'C:/omnibus-ruby/src'
+      include_examples 'a configurable', :build_dir, 'C:/omnibus-ruby/build'
+      include_examples 'a configurable', :package_dir, 'C:/omnibus-ruby/pkg'
+      include_examples 'a configurable', :package_tmp, 'C:/omnibus-ruby/pkg-tmp'
     end
 
     context 'when base_dir is changed' do

data/spec/unit/package_spec.rb

@@ -94,6 +94,7 @@ module Omnibus
         it_behaves_like 'a version manipulator', 'windows', '6.1.7601', '2008r2'
         it_behaves_like 'a version manipulator', 'windows', '6.2.9200', '8'
         it_behaves_like 'a version manipulator', 'windows', '6.3.9200', '8.1'
+        it_behaves_like 'a version manipulator', 'windows', '6.3.9600', '8.1'
 
         context 'given an unknown platform' do
           before do
@@ -144,6 +145,13 @@ module Omnibus
         expect(instance[:platform]).to eq('ubuntu')
       end
 
+     it 'ensures platform version is properly truncated' do
+        allow(File).to receive(:read).and_return('{ "platform": "el", "platform_version": "5.10" }')
+        instance = described_class.for_package(package)
+
+        expect(instance[:platform_version]).to eq('5')
+      end
+
       it 'ensures an iteration exists' do
         allow(File).to receive(:read).and_return('{}')
         instance = described_class.for_package(package)

data/spec/unit/publishers/artifactory_publisher_spec.rb

@@ -44,7 +44,10 @@ module Omnibus
     subject { described_class.new(path, repository: repository) }
 
     describe '#publish' do
-      before { allow(subject).to receive(:packages).and_return(packages) }
+      before do
+        allow(subject).to receive(:packages).and_return(packages)
+        Config.artifactory_base_path('com/getchef')
+      end
 
       it 'validates the package' do
         expect(package).to receive(:validate!).once
@@ -61,14 +64,6 @@ module Omnibus
         subject.publish
       end
 
-      context 'when the metadata is from an older version of Omnibus' do
-        before { allow(package.metadata).to receive(:[]).with(:homepage).and_return(nil) }
-
-        it 'raises an exception' do
-          expect { subject.publish }.to raise_error(OldMetadata)
-        end
-      end
-
       context 'when a block is given' do
         it 'yields the package to the block' do
           block = ->(package) { package.do_something! }

data/spec/unit/publishers/s3_publisher_spec.rb

@@ -39,18 +39,6 @@ module Omnibus
 
     subject { described_class.new(path) }
 
-    describe '#initialize' do
-      it 'raises an exception when publish_s3_access_key is missing' do
-        expect { Config.publish_s3_access_key }
-          .to raise_error(MissingConfigOption)
-      end
-
-      it 'raises an exception when release_s3_secret_key is missing' do
-        expect { Config.publish_s3_secret_key }
-          .to raise_error(MissingConfigOption)
-      end
-    end
-
     describe '#publish' do
       before { allow(subject).to receive(:packages).and_return(packages) }