omnijack 0.2.0 → 1.0.0.rc.1

data/spec/support/real_test_data.json

@@ -5,12 +5,12 @@
     "prerelease": false,
     "nightlies": false,
     "expected": {
-      "url": "https://opscode-omnibus-packages.s3.amazonaws.com/ubuntu/12.04/x86_64/chefdk_0.2.2-1_amd64.deb",
-      "filename": "chefdk_0.2.2-1_amd64.deb",
-      "version": "0.2.2",
+      "url": "https://opscode-omnibus-packages.s3.amazonaws.com/ubuntu/12.04/x86_64/chefdk_0.3.0-1_amd64.deb",
+      "filename": "chefdk_0.3.0-1_amd64.deb",
+      "version": "0.3.0",
       "build": "1",
-      "md5": "1b097776840aa10f092063d1579bf155",
-      "sha256": "a6384851473779d3b0d0bedc509607b924751ea3b356e7df4b9c7ab16dd25788"
+      "md5": "8c658c64df47a60dcd52f5c9399c3833",
+      "sha256": "88e84dfdf6ed16b1018d76f033a176a13c845a86de2f00ad733112b92c98bff0"
     }
   },
   {
@@ -40,12 +40,12 @@
     "prerelease": false,
     "nightlies": true,
     "expected": {
-      "url": "https://opscode-omnibus-packages.s3.amazonaws.com/ubuntu/12.04/x86_64/chefdk_0.2.2%2B20140918085104.git.23.997cf31-1_amd64.deb",
-      "filename": "chefdk_0.2.2+20140918085104.git.23.997cf31-1_amd64.deb",
-      "version": "0.2.2+20140918085104.git.23.997cf31",
+      "url": "https://opscode-omnibus-packages.s3.amazonaws.com/ubuntu/12.04/x86_64/chefdk_0.3.0%2B20141008085108-1_amd64.deb",
+      "filename": "chefdk_0.3.0+20141008085108-1_amd64.deb",
+      "version": "0.3.0+20141008085108",
       "build": "1",
-      "md5": "424793c215d387041a9d620eeab1ed34",
-      "sha256": "801d36aa94aa452dbe81c05eb4422fb022e2e7cba3d35a67f02cfa7416ac628f"
+      "md5": "d19b2f5b24389fe3fd95927f372c5ec1",
+      "sha256": "9f28c7d4425b08424b9a810bf77240cb6449a1449ac5de1c552f2c77b265ed23"
     }
   },
   {
@@ -120,7 +120,7 @@
     }
   },
   {
-    "platform": {"name": "windows", "version": "2008r2" },
+    "platform": {"name": "windows", "version": "6.1.7600" },
     "version": "0.2.2",
     "prerelease": false,
     "nightlies": false,
@@ -134,7 +134,7 @@
     }
   },
   {
-    "platform": {"name": "windows", "version": "2012" },
+    "platform": {"name": "windows", "version": "6.2.9200" },
     "version": "0.2.2",
     "prerelease": false,
     "nightlies": false,

data/vendor/chef/lib/chef/exceptions.rb

@@ -23,19 +23,19 @@ class Chef
   # namespace.
   class Exceptions
 
-    # Backcompat with Chef::ShellOut code:
-    require 'mixlib/shellout/exceptions'
-
-    def self.const_missing(const_name)
-      if const_name == :ShellCommandFailed
-        Chef::Log.warn("Chef::Exceptions::ShellCommandFailed is deprecated, use Mixlib::ShellOut::ShellCommandFailed")
-        called_from = caller[0..3].inject("Called from:\n") {|msg, trace_line| msg << "  #{trace_line}\n" }
-        Chef::Log.warn(called_from)
-        Mixlib::ShellOut::ShellCommandFailed
-      else
-        super
-      end
-    end
+    # # Backcompat with Chef::ShellOut code:
+    # require 'mixlib/shellout/exceptions'
+
+    # def self.const_missing(const_name)
+    #   if const_name == :ShellCommandFailed
+    #     Chef::Log.warn("Chef::Exceptions::ShellCommandFailed is deprecated, use Mixlib::ShellOut::ShellCommandFailed")
+    #     called_from = caller[0..3].inject("Called from:\n") {|msg, trace_line| msg << "  #{trace_line}\n" }
+    #     Chef::Log.warn(called_from)
+    #     Mixlib::ShellOut::ShellCommandFailed
+    #   else
+    #     super
+    #   end
+    # end
 
     class Application < RuntimeError; end
     class Cron < RuntimeError; end
@@ -118,6 +118,10 @@ class Chef
     class InvalidDataBagPath < ArgumentError; end
     class DuplicateDataBagItem < RuntimeError; end
 
+    class PowershellCmdletException < RuntimeError; end
+
+    class CannotDetermineHomebrewOwner < Package; end
+
     # A different version of a cookbook was added to a
     # VersionedRecipeList than the one already there.
     class CookbookVersionConflict < ArgumentError ; end
@@ -179,6 +183,8 @@ class Chef
 
     class ChildConvergeError < RuntimeError; end
 
+    class NoProviderAvailable < RuntimeError; end
+
     class MissingRole < RuntimeError
       NULL = Object.new
 

metadata

@@ -1,31 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: omnijack
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.0.0.rc.1
 platform: ruby
 authors:
 - Jonathan Hartman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-19 00:00:00.000000000 Z
+date: 2014-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: ohai
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: json
+  name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -203,17 +189,19 @@ files:
 - features/support/env.rb
 - lib/omnijack.rb
 - lib/omnijack/config.rb
-- lib/omnijack/list.rb
-- lib/omnijack/metadata.rb
-- lib/omnijack/platforms.rb
+- lib/omnijack/endpoint.rb
+- lib/omnijack/endpoint/list.rb
+- lib/omnijack/endpoint/metadata.rb
+- lib/omnijack/endpoint/platforms.rb
 - lib/omnijack/project.rb
 - lib/omnijack/project/metaprojects.rb
 - lib/omnijack/version.rb
 - omnijack.gemspec
 - spec/omnijack/config_spec.rb
-- spec/omnijack/list_spec.rb
-- spec/omnijack/metadata_spec.rb
-- spec/omnijack/platforms_spec.rb
+- spec/omnijack/endpoint/list_spec.rb
+- spec/omnijack/endpoint/metadata_spec.rb
+- spec/omnijack/endpoint/platforms_spec.rb
+- spec/omnijack/endpoint_spec.rb
 - spec/omnijack/project/angry_chef_spec.rb
 - spec/omnijack/project/chef_container_spec.rb
 - spec/omnijack/project/chef_dk_spec.rb
@@ -242,9 +230,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.1
@@ -261,9 +249,10 @@ test_files:
 - features/step_definitions/project.rb
 - features/support/env.rb
 - spec/omnijack/config_spec.rb
-- spec/omnijack/list_spec.rb
-- spec/omnijack/metadata_spec.rb
-- spec/omnijack/platforms_spec.rb
+- spec/omnijack/endpoint/list_spec.rb
+- spec/omnijack/endpoint/metadata_spec.rb
+- spec/omnijack/endpoint/platforms_spec.rb
+- spec/omnijack/endpoint_spec.rb
 - spec/omnijack/project/angry_chef_spec.rb
 - spec/omnijack/project/chef_container_spec.rb
 - spec/omnijack/project/chef_dk_spec.rb

data/lib/omnijack/list.rb

@@ -1,94 +0,0 @@
-# Encoding: UTF-8
-#
-# Author:: Jonathan Hartman (<j@p4nt5.com>)
-#
-# Copyright (C) 2014, Jonathan Hartman
-#
-# 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 'json'
-require 'open-uri'
-require_relative 'config'
-require_relative '../omnijack'
-
-class Omnijack
-  # A class for representing an Omnitruck full list object
-  #
-  # @author Jonathan Hartman <j@p4nt5.com>
-  class List < Omnijack
-    include Config
-
-    #
-    # Make list items accessible via methods
-    #
-    # @param [Symbol] method_id
-    #
-    def method_missing(method_id, args = nil)
-      args.nil? && to_h[method_id] || super
-    end
-
-    #
-    # Make list items accessible via hash keys
-    #
-    # @param [Symbol] key
-    # @return [String, NilClass]
-    #
-    def [](key)
-      to_h[key]
-    end
-
-    #
-    # Offer a hash representation of the list
-    #
-    # @return [Hash]
-    #
-    def to_h
-      # TODO: Use a Mash -- some keys are better off addressed as strings
-      JSON.parse(raw_data, symbolize_names: true)
-    end
-
-    #
-    # Use the raw data string as a string representation
-    #
-    define_method(:to_s) { raw_data }
-
-    private
-
-    #
-    # Fetch the raw list from the configured URI
-    #
-    # @return [String]
-    #
-    def raw_data
-      @raw_data ||= api_url.open.read
-    end
-
-    #
-    # Construct the full API query URL from base + endpoint
-    #
-    # @return [URI::HTTP, URI::HTTPS]
-    #
-    def api_url
-      @api_url ||= URI.parse(::File.join(base_url, endpoint))
-    end
-
-    #
-    # Return the API endpoint for the package list of this project
-    #
-    # @return [String]
-    #
-    def endpoint
-      OMNITRUCK_PROJECTS[name][:endpoints][:package_list]
-    end
-  end
-end

data/lib/omnijack/metadata.rb

@@ -1,238 +0,0 @@
-# Encoding: UTF-8
-#
-# Author:: Jonathan Hartman (<j@p4nt5.com>)
-#
-# Copyright (C) 2014, Jonathan Hartman
-#
-# 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 'ohai'
-require 'open-uri'
-require_relative 'config'
-require_relative '../omnijack'
-
-class Omnijack
-  # A class for representing an Omnitruck metadata object
-  #
-  # @author Jonathan Hartman <j@p4nt5.com>
-  class Metadata < Omnijack
-    include ::Chef::Mixin::ParamsValidate
-    include Config
-
-    def initialize(name, args = {})
-      super
-      args.each { |k, v| send(k, v) unless v.nil? } unless args.nil?
-      to_h
-    end
-
-    #
-    # Set up an accessor method for each piece of metadata
-    #
-    METADATA_ATTRIBUTES.each do |a|
-      define_method(a) { to_h[a] }
-    end
-    define_method(:filename) { to_h[:filename] }
-    define_method(:build) { to_h[:build] }
-
-    #
-    # Make metadata accessible via hash keys
-    #
-    # @param [Symbol] key
-    # @return [String, NilClass]
-    #
-    def [](key)
-      to_h[key]
-    end
-
-    #
-    # Offer a hash representation of the metadata
-    #
-    # @return [Hash]
-    #
-    def to_h
-      raw_metadata.split("\n").each_with_object({}) do |line, hsh|
-        key = line.split[0].to_sym
-        val = line.split[1]
-        val = true if val == 'true'
-        val = false if val == 'false'
-        hsh[key] = val
-        key == :url && hsh.merge!(parse_url_data(val)) && version(hsh[:version])
-      end
-    end
-
-    #
-    # Use the raw metadata string as a string representation
-    #
-    define_method(:to_s) { raw_metadata }
-
-    #
-    # The version of the project
-    #
-    # @param [String, NilClass] arg
-    # @return [String]
-    #
-    def version(arg = nil)
-      set_or_return(:version, arg, kind_of: String, default: 'latest')
-    end
-
-    #
-    # Whether to enable prerelease and/or nightly packages
-    #
-    # @param [TrueClass, FalseClass, NilClass] arg
-    # @return [TrueClass, FalseClass]
-    #
-    [:prerelease, :nightlies].each do |m|
-      define_method(m) do |arg = nil|
-        set_or_return(m, arg, kind_of: [TrueClass, FalseClass], default: false)
-      end
-    end
-
-    #
-    # The name of the desired platform
-    #
-    # @param [String, NilClass]
-    # @return [String]
-    #
-    def platform(arg = nil)
-      set_or_return(:platform, arg, kind_of: String, default: node[:platform])
-    end
-
-    #
-    # The version of the desired platform
-    #
-    # @param [String, NilClass] arg
-    # @return [String]
-    #
-    def platform_version(arg = nil)
-      # TODO: The platform version parser living in `node` means passing e.g.
-      # '10.9.2' here won't result in it being shortened to '10.9'
-      set_or_return(:platform_version,
-                    arg,
-                    kind_of: String,
-                    default: node[:platform_version])
-    end
-
-    #
-    # The machine architecture of the desired platform
-    #
-    # @param [String, NilClass]
-    # @return [String]
-    #
-    def machine_arch(arg = nil)
-      set_or_return(:machine_arch,
-                    arg,
-                    kind_of: String,
-                    default: node[:kernel][:machine])
-    end
-
-    private
-
-    #
-    # Fetch the raw metadata from the configured URI
-    #
-    # @return [String]
-    #
-    def raw_metadata
-      @raw_metadata ||= api_url.open.read
-    end
-
-    #
-    # Construct the full API query URL from base + endpoint + params
-    #
-    # @return [URI::HTTP, URI::HTTPS]
-    #
-    def api_url
-      @api_url ||= URI.parse(
-        File.join(base_url, "#{endpoint}?#{URI.encode_www_form(query_params)}")
-      )
-    end
-
-    #
-    # Convert all the metadata attrs into params Omnitruck understands
-    #
-    # @return [Hash]
-    #
-    def query_params
-      { v: version,
-        prerelease: prerelease,
-        nightlies: nightlies,
-        p: platform,
-        pv: platform_version,
-        m: machine_arch }
-    end
-
-    #
-    # Return the API endpoint for the metadata of this project
-    #
-    # @return [String]
-    #
-    def endpoint
-      OMNITRUCK_PROJECTS[name][:endpoints][:metadata]
-    end
-
-    #
-    # Fetch and return node data from Ohai
-    #
-    # @return [Mash]
-    #
-    def node
-      unless @node
-        @node = Ohai::System.new.all_plugins('platform')[0].data
-        case @node[:platform]
-        when 'mac_os_x'
-          @node[:platform_version] = platform_version_mac_os_x
-        when 'windows'
-          @node[:platform_version] = platform_version_windows
-        end
-      end
-      @node
-    end
-
-    #
-    # Apply special logic for the version of an OS X platform
-    #
-    # @return [String]
-    #
-    def platform_version_mac_os_x
-      node[:platform_version].match(/^[0-9]+\.[0-9]+/).to_s
-    end
-
-    #
-    # Apply special logic for the version of a Windows platform
-    #
-    # @return [String]
-    #
-    def platform_version_windows
-      # Make a best guess and assume a server OS
-      # See: http://msdn.microsoft.com/en-us/library/windows/
-      #      desktop/ms724832(v=vs.85).aspx
-      {
-        '6.3' => '2012r2', '6.2' => '2012', '6.1' => '2008r2', '6.0' => '2008',
-        '5.2' => '2003r2', '5.1' => 'xp', '5.0' => '2000'
-      }[node[:platform_version].match(/^[0-9]+\.[0-9]+/).to_s]
-    end
-
-    #
-    # Extract a filename, package version, and build from a package URL
-    #
-    # @param [String] url
-    # @return [[String] filename, [String] version, [String] build]
-    #
-    def parse_url_data(url)
-      filename = URI.decode(url).split('/')[-1]
-      { filename: filename,
-        version: filename.split('-')[-2].split('_')[-1],
-        build: filename.split('-')[-1].split('.')[0].split('_')[0] }
-    end
-  end
-end

data/spec/omnijack/platforms_spec.rb

@@ -1,132 +0,0 @@
-# Encoding: UTF-8
-#
-# Author:: Jonathan Hartman (<j@p4nt5.com>)
-#
-# Copyright (C) 2014, Jonathan Hartman
-#
-# 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_relative '../spec_helper'
-require_relative '../../lib/omnijack/platforms'
-
-describe Omnijack::Platforms do
-  let(:name) { :chef_dk }
-  let(:obj) { described_class.new(name) }
-
-  describe '#method_missing' do
-    let(:to_h) { { thing1: 'yup', thing2: 'nope', thing3: 'maybe' } }
-
-    before(:each) do
-      allow_any_instance_of(described_class).to receive(:to_h).and_return(to_h)
-    end
-
-    it 'sets up methods for the platform hash keys' do
-      expect(obj.thing1).to eq('yup')
-      expect(obj.thing2).to eq('nope')
-      expect(obj.thing3).to eq('maybe')
-    end
-
-    it 'raises an exception otherwise' do
-      expect { obj.thing4 }.to raise_error(NoMethodError)
-    end
-  end
-
-  describe '#[]' do
-    let(:to_h) { { thing1: 'yup', thing2: 'nope', thing3: 'maybe' } }
-
-    before(:each) do
-      allow_any_instance_of(described_class).to receive(:to_h).and_return(to_h)
-    end
-
-    it 'returns the correct data' do
-      expect(obj[:thing1]).to eq('yup')
-      expect(obj[:thing2]).to eq('nope')
-      expect(obj[:thing3]).to eq('maybe')
-    end
-  end
-
-  describe '#to_h' do
-    context 'fake data' do
-      let(:raw_data) { '{"thing1": "yup", "thing2": "nope"}' }
-
-      before(:each) do
-        allow_any_instance_of(described_class).to receive(:raw_data)
-          .and_return(raw_data)
-      end
-
-      it 'returns the correct result hash' do
-        expect(obj.to_h).to eq(thing1: 'yup', thing2: 'nope')
-      end
-    end
-
-    context 'real data' do
-      let(:obj) { described_class.new(:chef) }
-
-      it 'returns the expected data' do
-        expect(obj.to_h[:el]).to eq('Enterprise Linux')
-      end
-    end
-  end
-
-  describe '#to_s' do
-    let(:raw_data) { 'SOME STUFF' }
-
-    before(:each) do
-      allow_any_instance_of(described_class).to receive(:raw_data)
-        .and_return(raw_data)
-    end
-
-    it 'returns the raw HTTP GET string' do
-      expect(obj.to_s).to eq(raw_data)
-    end
-  end
-
-  describe '#raw_data' do
-    let(:read) { '{"thing1": "yup", "thing2": "nope"}' }
-    let(:open) { double(read: read) }
-
-    before(:each) do
-      allow_any_instance_of(URI::HTTP).to receive(:open).and_return(open)
-    end
-
-    it 'returns a GET of the API URL' do
-      res = obj
-      expect(res.send(:raw_data)).to eq(read)
-      expect(res.instance_variable_get(:@raw_data)).to eq(read)
-    end
-  end
-
-  describe '#api_url' do
-    let(:base_url) { 'http://example.com/chef' }
-    let(:endpoint) { '/example_platform_names' }
-
-    before(:each) do
-      [:base_url, :endpoint].each do |i|
-        allow_any_instance_of(described_class).to receive(i).and_return(send(i))
-      end
-    end
-
-    it 'constructs a URL based on base + endpoint' do
-      expected = URI.parse('http://example.com/chef/example_platform_names')
-      expect(obj.send(:api_url)).to eq(expected)
-    end
-  end
-
-  describe '#endpoint' do
-    let(:name) { :chef_container }
-
-    it 'returns the appropriate metadata endpoint' do
-      expect(obj.send(:endpoint)).to eq('/chef_container_platform_names')
-    end
-  end
-end