omnijack 0.2.0 → 1.0.0.rc.1

data/spec/omnijack/{metadata_spec.rb → endpoint/metadata_spec.rb}

@@ -16,13 +16,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'json'
-require_relative '../spec_helper'
-require_relative '../../lib/omnijack/metadata'
+require 'multi_json'
+require_relative '../../spec_helper'
+require_relative '../../../lib/omnijack/endpoint/metadata'
 
-describe Omnijack::Metadata do
+describe Omnijack::Endpoint::Metadata do
   let(:name) { :chef_dk }
-  let(:args) { nil }
+  let(:args) do
+    { platform: 'linspire', platform_version: '3.3.3', machine_arch: 'risc' }
+  end
   let(:obj) { described_class.new(name, args) }
 
   before(:each) do
@@ -30,28 +32,35 @@ describe Omnijack::Metadata do
   end
 
   describe '#initialize' do
-    it 'initializes the object hash data' do
-      expect_any_instance_of(described_class).to receive(:to_h).and_return(true)
-      obj
-    end
-
-    {
-      platform: 'linspire',
-      platform_version: '3.3.3',
-      machine_arch: 'risc'
-    }.each do |k, v|
-      context "a #{k} arg provided" do
-        let(:args) { { k => v } }
-
-        it 'sets the given arg' do
+    context 'the required args provided' do
+      {
+        platform: 'linspire', platform_version: '3.3.3', machine_arch: 'risc'
+      }.each do |k, v|
+        it "sets the given #{k}" do
           expect(obj.send(k)).to eq(v)
           expect(obj.instance_variable_get(:"@#{k}")).to eq(v)
         end
       end
     end
 
+    [:platform, :platform_version, :machine_arch].each do |i|
+      context "missing #{i} arg" do
+        let(:args) do
+          a = super()
+          a.delete(i) && a
+        end
+
+        it 'raises an error' do
+          expect { obj }.to raise_error(Chef::Exceptions::ValidationFailed)
+        end
+      end
+    end
+
     context 'an invalid arg provided' do
-      let(:args) { { potatoes: 'peeled' } }
+      let(:args) do
+        a = super()
+        a.merge!(potatoes: 'peeled') && a
+      end
 
       it 'raises an exception' do
         expect { obj }.to raise_error(NoMethodError)
@@ -72,26 +81,6 @@ describe Omnijack::Metadata do
     end
   end
 
-  describe '#[]' do
-    let(:attributes) do
-      [:url, :md5, :sha256, :yolo, :filename, :version, :build]
-    end
-
-    before(:each) do
-      allow_any_instance_of(described_class).to receive(:to_h)
-        .and_return(attributes.each_with_object({}) do |a, hsh|
-                      hsh[a] = "#{a} things"
-                      hsh
-                    end)
-    end
-
-    [:url, :md5, :sha256, :yolo, :filename, :version, :build].each do |a|
-      it "returns the correct #{a}" do
-        expect(obj[a]).to eq("#{a} things")
-      end
-    end
-  end
-
   describe '#to_h' do
     before(:each) do
       allow_any_instance_of(described_class).to receive(:to_h)
@@ -108,13 +97,13 @@ describe Omnijack::Metadata do
         'afd487ab6f0cd0286a0a3d2808a041c784c064eddb6193d688edfb6741065b56'
       end
       let(:yolo) { true }
-      let(:raw_metadata) do
+      let(:raw_data) do
         "url\t#{url}\nmd5\t#{md5}\nsha256\t#{sha256}\nyolo\t#{yolo}"
       end
 
       before(:each) do
-        allow_any_instance_of(described_class).to receive(:raw_metadata)
-          .and_return(raw_metadata)
+        allow_any_instance_of(described_class).to receive(:raw_data)
+          .and_return(raw_data)
       end
 
       it 'returns the correct result hash' do
@@ -150,13 +139,13 @@ describe Omnijack::Metadata do
         'b9ecab8f2ebb258c3bdc341ab82310dfbfc8b8a5b27802481f27daf607ba7f99'
       end
       let(:yolo) { true }
-      let(:raw_metadata) do
+      let(:raw_data) do
         "url\t#{url}\nmd5\t#{md5}\nsha256\t#{sha256}\nyolo\t#{yolo}"
       end
 
       before(:each) do
-        allow_any_instance_of(described_class).to receive(:raw_metadata)
-          .and_return(raw_metadata)
+        allow_any_instance_of(described_class).to receive(:raw_data)
+          .and_return(raw_data)
       end
 
       it 'decodes the encoded URL' do
@@ -169,9 +158,9 @@ describe Omnijack::Metadata do
       end
     end
 
-    json = ::File.open(File.expand_path('../../support/real_test_data.json',
+    json = ::File.open(File.expand_path('../../../support/real_test_data.json',
                                         __FILE__)).read
-    JSON.parse(json, symbolize_names: true).each do |data|
+    MultiJson.load(json, symbolize_names: true).each do |data|
       context "#{data[:platform]} Chef-DK" do
         let(:obj) do
           described_class.new(:chef_dk,
@@ -194,18 +183,6 @@ describe Omnijack::Metadata do
     end
   end
 
-  describe '#to_s' do
-    let(:raw_metadata) { 'SOME METADATA' }
-    before(:each) do
-      allow_any_instance_of(described_class).to receive(:raw_metadata)
-        .and_return(raw_metadata)
-    end
-
-    it 'returns the raw metadata string' do
-      expect(obj.to_s).to eq(raw_metadata)
-    end
-  end
-
   describe '#version' do
     context 'no argument provided' do
       it 'returns latest' do
@@ -306,29 +283,23 @@ describe Omnijack::Metadata do
   end
 
   describe '#platform' do
-    let(:node) { { platform: 'ms_dos' } }
-
-    before(:each) do
-      allow_any_instance_of(described_class).to receive(:node).and_return(node)
-    end
-
     context 'no argument provided' do
-      it 'uses the node Ohai data' do
-        res = obj
-        expect(res.platform).to eq('ms_dos')
-        expect(res.instance_variable_get(:@platform)).to eq('ms_dos')
+      it 'returns the initialized arg' do
+        expected = args[:platform]
+        expect(obj.platform).to eq(expected)
+        expect(obj.instance_variable_get(:@platform)).to eq(expected)
       end
     end
 
     context 'a valid argument provided' do
       let(:obj) do
         o = super()
-        o.platform('ms_bob') && o
+        o.platform('ms_dos') && o
       end
 
       it 'uses the provided arg' do
-        expect(obj.platform).to eq('ms_bob')
-        expect(obj.instance_variable_get(:@platform)).to eq('ms_bob')
+        expect(obj.platform).to eq('ms_dos')
+        expect(obj.instance_variable_get(:@platform)).to eq('ms_dos')
       end
     end
 
@@ -345,16 +316,11 @@ describe Omnijack::Metadata do
   end
 
   describe '#platform_version' do
-    let(:node) { { platform_version: '1.2.3' } }
-
-    before(:each) do
-      allow_any_instance_of(described_class).to receive(:node).and_return(node)
-    end
-
     context 'no argument provided' do
-      it 'uses the node Ohai data' do
-        expect(obj.platform_version).to eq('1.2.3')
-        expect(obj.instance_variable_get(:@platform_version)).to eq('1.2.3')
+      it 'returns the initialized arg' do
+        expected = args[:platform_version]
+        expect(obj.platform_version).to eq(expected)
+        expect(obj.instance_variable_get(:@platform_version)).to eq(expected)
       end
     end
 
@@ -383,17 +349,11 @@ describe Omnijack::Metadata do
   end
 
   describe '#machine_arch' do
-    let(:node) { { kernel: { machine: 'x86_64' } } }
-
-    before(:each) do
-      allow_any_instance_of(described_class).to receive(:node).and_return(node)
-    end
-
     context 'no argument provided' do
-      it 'uses the node Ohai data' do
-        res = obj
-        expect(res.machine_arch).to eq('x86_64')
-        expect(res.instance_variable_get(:@machine_arch)).to eq('x86_64')
+      it 'returns the initialized arg' do
+        expected = args[:machine_arch]
+        expect(obj.machine_arch).to eq(expected)
+        expect(obj.instance_variable_get(:@machine_arch)).to eq(expected)
       end
     end
 
@@ -421,33 +381,17 @@ describe Omnijack::Metadata do
     end
   end
 
-  describe '#raw_metadata' do
-    let(:open) { double(read: 'SOME STUFF') }
-
-    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
-      expect(obj.send(:raw_metadata)).to eq('SOME STUFF')
-      expect(obj.instance_variable_get(:@raw_metadata)).to eq('SOME STUFF')
-    end
-  end
-
   describe '#api_url' do
-    let(:base_url) { 'http://example.com/chef' }
-    let(:endpoint) { '/metadata-example' }
-    let(:query_params) { { v: '1.2.3', p: 'ubuntu' } }
+    let(:query_params) { { v: '1.2.3', p: 'ubuntu', pv: '12.04' } }
 
     before(:each) do
-      [:base_url, :endpoint, :query_params].each do |i|
-        allow_any_instance_of(described_class).to receive(i).and_return(send(i))
-      end
+      allow_any_instance_of(described_class).to receive(:query_params)
+        .and_return(query_params)
     end
 
-    it 'constructs a URL based on base + endpoint + params' do
-      expected = URI.parse('http://example.com/chef/metadata-example?' \
-                           'v=1.2.3&p=ubuntu')
+    it 'returns the appropriate metadata endpoint' do
+      expected = URI.parse('https://www.getchef.com/chef/metadata-chefdk?' \
+                           'v=1.2.3&p=ubuntu&pv=12.04')
       expect(obj.send(:api_url)).to eq(expected)
     end
   end
@@ -479,101 +423,15 @@ describe Omnijack::Metadata do
     end
   end
 
-  describe '#endpoint' do
-    let(:name) { 'chef_container' }
-
-    it 'returns the appropriate metadata endpoint' do
-      expect(obj.send(:endpoint)).to eq('/metadata-container')
-    end
-  end
-
-  describe '#node' do
-    let(:platform) { nil }
-    let(:platform_version) { nil }
-    let(:system) do
-      double(all_plugins: [
-        double(data: { platform: platform, platform_version: platform_version })
-      ])
-    end
-
-    before(:each) do
-      unless platform.nil? || platform_version.nil?
-        allow(Ohai::System).to receive(:new).and_return(system)
-      end
-    end
-
-    it 'loads and returns Ohai platform data' do
-      node = obj.send(:node)
-      expect(node[:platform]).to be_an_instance_of(String)
-      expect(node[:platform_version]).to be_an_instance_of(String)
-    end
-
-    context 'Mac OS X' do
-      let(:platform) { 'mac_os_x' }
-      let(:platform_version) { '10.9.2' }
-
-      it 'calls the custom Mac OS X version logic' do
-        o = obj
-        expect(o).to receive(:platform_version_mac_os_x).and_call_original
-        expect(o.send(:node)[:platform_version]).to eq('10.9')
-      end
-    end
-
-    context 'Windows' do
-      let(:platform) { 'windows' }
-      let(:platform_version) { '6.3' }
-
-      it 'calls the custom Windows version logic' do
-        o = obj
-        expect(o).to receive(:platform_version_windows).and_call_original
-        expect(o.send(:node)[:platform_version]).to eq('2012r2')
-      end
-    end
-
-    context 'CentOS' do
-      let(:platform) { 'centos' }
-      let(:platform_version) { '7.0' }
-
-      it 'does not modify the version' do
-        expect(obj.send(:node)[:platform_version]).to eq('7.0')
-      end
-    end
-
-    context 'Ubuntu' do
-      let(:platform) { 'ubuntu' }
-      let(:platform_version) { '14.04' }
-
-      it 'does not modify the version' do
-        expect(obj.send(:node)[:platform_version]).to eq('14.04')
-      end
-    end
-  end
-
   describe '#platform_version_mac_os_x' do
-    let(:node) { { platform_version: platform_version } }
-
-    before(:each) do
-      allow_any_instance_of(described_class).to receive(:node).and_return(node)
-    end
-
     { '10.9' => '10.9', '10.9.4' => '10.9' }.each do |ver, expected|
-      context "Mac OS X version #{ver}" do
-        let(:platform_version) { ver }
-
-        it "returns Mac OSX #{expected}" do
-          expect(obj.send(:platform_version_mac_os_x)).to eq(expected)
-        end
+      it "returns #{expected} for Mac OS X #{ver}" do
+        expect(obj.send(:platform_version_mac_os_x, ver)).to eq(expected)
       end
     end
   end
 
   describe '#platform_version_windows' do
-    let(:node) { { platform_version: platform_version } }
-
-    before(:each) do
-      allow_any_instance_of(described_class).to receive(:node).and_return(node)
-    end
-
     {
       '6.3.123456.789' => '2012r2',
       '6.2.123456.789' => '2012',
@@ -583,12 +441,8 @@ describe Omnijack::Metadata do
       '5.1.123456.789' => 'xp',
       '5.0.123456.789' => '2000'
     }.each do |ver, expected|
-      context "Windows version #{ver}" do
-        let(:platform_version) { ver }
-
-        it "returns Windows #{expected}" do
-          expect(obj.send(:platform_version_windows)).to eq(expected)
-        end
+      it "returns #{expected} for Windows #{ver}" do
+        expect(obj.send(:platform_version_windows, ver)).to eq(expected)
       end
     end
   end

data/spec/omnijack/endpoint/platforms_spec.rb

@@ -0,0 +1,33 @@
+# 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/endpoint/platforms'
+
+describe Omnijack::Endpoint::Platforms do
+  let(:name) { :chef_dk }
+  let(:obj) { described_class.new(name) }
+
+  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

data/spec/omnijack/{list_spec.rb → endpoint_spec.rb}

@@ -17,11 +17,43 @@
 # limitations under the License.
 
 require_relative '../spec_helper'
-require_relative '../../lib/omnijack/list'
+require_relative '../../lib/omnijack/endpoint'
 
-describe Omnijack::List do
+describe Omnijack::Endpoint do
   let(:name) { :chef_dk }
-  let(:obj) { described_class.new(name) }
+  let(:args) { {} }
+  let(:obj) { described_class.new(name, args) }
+
+  describe '#initialize' do
+    shared_examples_for 'any context' do
+      it 'sets the project name' do
+        expect(obj.name).to eq(:chef_dk)
+        expect(obj.instance_variable_get(:@name)).to eq(:chef_dk)
+      end
+    end
+
+    context 'no extra args provided' do
+      let(:obj) { described_class.new(name) }
+
+      it_behaves_like 'any context'
+
+      it 'holds an empty hash for the args' do
+        expect(obj.args).to eq({})
+        expect(obj.instance_variable_get(:@args)).to eq({})
+      end
+    end
+
+    context 'a base_url arg provided' do
+      let(:args) { { base_url: 'https://example.com' } }
+
+      it_behaves_like 'any context'
+
+      it 'sets the given arg' do
+        expect(obj.send(:base_url)).to eq(args[:base_url])
+        expect(obj.instance_variable_get(:@base_url)).to eq(args[:base_url])
+      end
+    end
+  end
 
   describe '#method_missing' do
     let(:to_h) { { thing1: 'yup', thing2: 'nope', thing3: 'maybe' } }
@@ -70,8 +102,14 @@ describe Omnijack::List do
     end
 
     context 'real data' do
+      let(:endpoint) { '/full_client_list' }
       let(:obj) { described_class.new(:chef) }
 
+      before(:each) do
+        allow_any_instance_of(described_class).to receive(:endpoint)
+          .and_return(endpoint)
+      end
+
       it 'returns the expected data' do
         expected = '/el/6/i686/chef-10.12.0-1.el6.i686.rpm'
         expect(obj.to_h[:suse][:'12.1'][:i686][:'10.12.0-1']).to eq(expected)
@@ -87,17 +125,53 @@ describe Omnijack::List do
         .and_return(raw_data)
     end
 
-    it 'returns the raw HTTP GET string' do
-      expect(obj.to_s).to eq(raw_data)
+    it 'returns the raw data' do
+      expect(obj.to_s).to eq('SOME STUFF')
+    end
+  end
+
+  describe '#base_url' do
+    context 'no argument provided' do
+      it 'uses the default' do
+        res = obj
+        expected = 'https://www.getchef.com/chef'
+        expect(res.base_url).to eq(expected)
+        expect(res.instance_variable_get(:@base_url)).to eq(expected)
+      end
+    end
+
+    context 'a valid argument provided' do
+      let(:obj) do
+        o = super()
+        o.base_url('http://example.com') && o
+      end
+
+      it 'uses the provided arg' do
+        expect(obj.base_url).to eq('http://example.com')
+        expect(obj.instance_variable_get(:@base_url))
+          .to eq('http://example.com')
+      end
+    end
+
+    context 'an invalid argument provided' do
+      let(:obj) do
+        o = super()
+        o.base_url(:hello) && o
+      end
+
+      it 'raises an exception' do
+        expect { obj }.to raise_error(Chef::Exceptions::ValidationFailed)
+      end
     end
   end
 
   describe '#raw_data' do
     let(:read) { '{"thing1": "yup", "thing2": "nope"}' }
-    let(:open) { double(read: read) }
+    let(:api_url) { double(open: double(read: read)) }
 
     before(:each) do
-      allow_any_instance_of(URI::HTTP).to receive(:open).and_return(open)
+      allow_any_instance_of(described_class).to receive(:api_url)
+        .and_return(api_url)
     end
 
     it 'returns a GET of the API URL' do
@@ -124,10 +198,15 @@ describe Omnijack::List do
   end
 
   describe '#endpoint' do
-    let(:name) { :chef_container }
+    let(:name) { :cook }
+
+    before(:each) do
+      stub_const('::Omnijack::Endpoint::OMNITRUCK_PROJECTS',
+                 cook: { endpoints: { endpoint: '/there' } })
+    end
 
     it 'returns the appropriate metadata endpoint' do
-      expect(obj.send(:endpoint)).to eq('/full_container_list')
+      expect(obj.send(:endpoint)).to eq('/there')
     end
   end
 end

data/spec/omnijack/project_spec.rb

@@ -20,28 +20,32 @@ require_relative '../spec_helper'
 require_relative '../../lib/omnijack/project'
 
 describe Omnijack::Project do
-  let(:args) { nil }
+  let(:args) { {} }
   let(:obj) { described_class.new(:chef_dk, args) }
 
   describe '#list' do
     it 'returns a List object' do
       res = obj
       [res.list, res.instance_variable_get(:@list)].each do |i|
-        expect(i).to be_an_instance_of(Omnijack::List)
+        expect(i).to be_an_instance_of(Omnijack::Endpoint::List)
       end
     end
   end
 
   describe '#metadata' do
+    let(:args) do
+      { platform: 'ms_dos', platform_version: '1.2.3', machine_arch: 'i386' }
+    end
+
     before(:each) do
-      allow_any_instance_of(Omnijack::Metadata).to receive(:to_h)
+      allow_any_instance_of(Omnijack::Endpoint::Metadata).to receive(:to_h)
         .and_return(true)
     end
 
     it 'returns a Metadata object' do
       res = obj
       [res.metadata, res.instance_variable_get(:@metadata)].each do |i|
-        expect(i).to be_an_instance_of(Omnijack::Metadata)
+        expect(i).to be_an_instance_of(Omnijack::Endpoint::Metadata)
       end
     end
   end
@@ -50,7 +54,7 @@ describe Omnijack::Project do
     it 'returns a Platforms object' do
       res = obj
       [res.platforms, res.instance_variable_get(:@platforms)].each do |i|
-        expect(i).to be_an_instance_of(Omnijack::Platforms)
+        expect(i).to be_an_instance_of(Omnijack::Endpoint::Platforms)
       end
     end
   end

data/spec/omnijack_spec.rb

@@ -53,50 +53,6 @@ describe Omnijack do
         expect(obj.instance_variable_get(:@args)).to eq(args)
       end
     end
-
-    context 'a base_url arg provided' do
-      let(:args) { { base_url: 'https://example.com' } }
-
-      it 'sets the given arg' do
-        expect(obj.send(:base_url)).to eq(args[:base_url])
-        expect(obj.instance_variable_get(:@base_url)).to eq(args[:base_url])
-      end
-    end
-  end
-
-  describe '#base_url' do
-    context 'no argument provided' do
-      it 'uses the default' do
-        res = obj
-        expected = 'https://www.getchef.com/chef'
-        expect(res.base_url).to eq(expected)
-        expect(res.instance_variable_get(:@base_url)).to eq(expected)
-      end
-    end
-
-    context 'a valid argument provided' do
-      let(:obj) do
-        o = super()
-        o.base_url('http://example.com') && o
-      end
-
-      it 'uses the provided arg' do
-        expect(obj.base_url).to eq('http://example.com')
-        expect(obj.instance_variable_get(:@base_url))
-          .to eq('http://example.com')
-      end
-    end
-
-    context 'an invalid argument provided' do
-      let(:obj) do
-        o = super()
-        o.base_url(:hello) && o
-      end
-
-      it 'raises an exception' do
-        expect { obj }.to raise_error(Chef::Exceptions::ValidationFailed)
-      end
-    end
   end
 
   describe '#name' do
@@ -106,4 +62,12 @@ describe Omnijack do
       expect(obj.name).to eq(:chef_container)
     end
   end
+
+  describe '#args' do
+    let(:args) { { platform: 'thing' } }
+
+    it 'returns the provided args' do
+      expect(obj.args).to eq(args)
+    end
+  end
 end