omnijack 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da7422f86d418432f15e842c07893ddbb80cb807
-  data.tar.gz: 6050a19116b57cf4dee6bb0673ecef04b5d75b56
+  metadata.gz: aeb8894485a0535402354e44a89af0f2680eafb1
+  data.tar.gz: e796af156188ff864273b22ce2ae0d86ff135a2d
 SHA512:
-  metadata.gz: 094232a1c079a354cbcb2911d612506e817b9cf505c1efaeff0c626b877f4cd78949604d87d430702627312556de00342a2293885e459d9800211fb4361afaa9
-  data.tar.gz: 8ca336d7b810c0d16a5f0183c04091d1cb2f3ea143fd1b6a24302b0004ace3e8ca5f00a5ea0d603ccf84bea07c93e59ee4be02ba5860eebd5522b9d22ae8ad17
+  metadata.gz: d274575560bbb203f4aef90884115bddbad6589e2275e9751f13e18e001984545aa22e1a4391faa2d3e2b6aa58c792fc46bd8dd78b5ba8ae2a7dcd58d6ede6af
+  data.tar.gz: cdd53e9b36a28cdb606b9b09968a34e0c7a79dc06aa55de489b2f25d93f540e222ca42c8e811a4b4ecb4abc30b09d894a8eb5efd32d99d06a0b4bf4d9fcff7e1

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 Omnijack Gem CHANGELOG
 ======================
 
+v1.0.1 (2014-12-02)
+-------------------
+- Replace every instance of `getchef.com` with `chef.io`
+
 v1.0.0 (2014-10-24)
 -------------------
 - Remove dependency on `ohai`; require platform arguments for metadata

data/NOTICE

@@ -1,5 +1,5 @@
 Omnijack NOTICE
 ===============
 
-Omnijack incorporates code from Chef (http://www.getchef.com), which is
+Omnijack incorporates code from Chef (http://www.chef.io), which is
 Copyright (c) 2008-2014 Opscode/Chef.

data/README.md

@@ -89,6 +89,11 @@ Omnijack::Project::ChefDk.new(
   nightlies: true
 )
 ```
+Getting Chef project data:
+
+```ruby
+Omnijack::Project::Chef.new
+```
 
 Getting the Chef project's list of packages:
 
@@ -109,22 +114,17 @@ Getting AngryChef project data:
 ```ruby
 Omnijack::Project::AngryChef.new
 ```
-Getting Chef project data:
-
-```ruby
-Omnijack::Project::Chef.new
-```
 
 Getting Chef-Container project data:
 
 ```ruby
-Omnijack::Project::Container.new
+Omnijack::Project::ChefContainer.new
 ```
 
 Getting Chef Server project data:
 
 ```ruby
-Omnijack::Project::Server.new
+Omnijack::Project::ChefServer.new
 ```
 
 Contributing

data/lib/omnijack/config.rb

@@ -21,7 +21,7 @@ class Omnijack
   #
   # @author Jonathan Hartman <j@p4nt5.com>
   module Config
-    DEFAULT_BASE_URL ||= 'https://www.getchef.com/chef'
+    DEFAULT_BASE_URL ||= 'https://www.chef.io/chef'
     OMNITRUCK_PROJECTS ||= {
       angry_chef: {
         endpoints: {

data/lib/omnijack/endpoint/metadata.rb

@@ -36,6 +36,7 @@ class Omnijack
           args.delete(i)
         end
         args.each { |k, v| send(k, v) unless v.nil? } unless args.nil?
+        version(to_h[:version])
         to_h
       end
 
@@ -53,13 +54,12 @@ class Omnijack
       #
       def to_h
         raw_data.split("\n").each_with_object({}) do |line, hsh|
-          key = line.split[0].to_sym
-          val = line.split[1]
+          key, val = line.split.entries
+          key = key.to_sym
           val = true if val == 'true'
           val = false if val == 'false'
           hsh[key] = val
-          key == :url && hsh.merge!(parse_url_data(val)) && \
-            version(hsh[:version])
+          key == :url && hsh.merge!(parse_url_data(val))
         end
       end
 

data/lib/omnijack/version.rb

@@ -20,5 +20,5 @@
 #
 # @author Jonathan Hartman <j@p4nt5.com>
 class Omnijack
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/spec/omnijack/config_spec.rb

@@ -22,7 +22,7 @@ require_relative '../../lib/omnijack/config'
 describe Omnijack::Config do
   describe 'DEFAULT_BASE_URL' do
     it 'uses the official Chef API' do
-      expected = 'https://www.getchef.com/chef'
+      expected = 'https://www.chef.io/chef'
       expect(described_class::DEFAULT_BASE_URL).to eq(expected)
     end
   end
@@ -36,12 +36,12 @@ describe Omnijack::Config do
     described_class::OMNITRUCK_PROJECTS.each do |project, attrs|
       attrs[:endpoints].each do |name, endpoint|
         it "uses a valid #{project}::#{name} endpoint" do
-          url = "http://www.getchef.com/chef#{endpoint}"
+          url = "http://www.chef.io/chef#{endpoint}"
           url << '?v=latest&p=ubuntu&pv=12.04&m=x86_64' if name == :metadata
 
           # Some endpoints aren't available on Chef's public Omnitruck API
           if [:angry_chef, :chef_dk, :chef_container].include?(project) && \
-            [:list, :platforms].include?(name)
+             [:list, :platforms].include?(name)
             expected = 301
           else
             expected = 200

data/spec/omnijack/endpoint/metadata_spec.rb

@@ -25,16 +25,20 @@ describe Omnijack::Endpoint::Metadata do
   let(:args) do
     { platform: 'linspire', platform_version: '3.3.3', machine_arch: 'risc' }
   end
+  let(:to_h) { { version: '1.2.3' } }
   let(:obj) { described_class.new(name, args) }
 
   before(:each) do
-    allow_any_instance_of(described_class).to receive(:to_h).and_return(true)
+    allow_any_instance_of(described_class).to receive(:to_h).and_return(to_h)
   end
 
   describe '#initialize' do
     context 'the required args provided' do
       {
-        platform: 'linspire', platform_version: '3.3.3', machine_arch: 'risc'
+        platform: 'linspire',
+        platform_version: '3.3.3',
+        machine_arch: 'risc',
+        version: '1.2.3'
       }.each do |k, v|
         it "sets the given #{k}" do
           expect(obj.send(k)).to eq(v)
@@ -113,11 +117,6 @@ describe Omnijack::Endpoint::Metadata do
         expect(obj.to_h).to eq(expected)
       end
 
-      it 'overwrites the requested version with the actual package version' do
-        expect(obj.version).to eq('0.2.1')
-        expect(obj.instance_variable_get(:@version)).to eq('0.2.1')
-      end
-
       [true, false].each do |tf|
         context "data with a #{tf} value in it" do
           let(:yolo) { tf }
@@ -185,6 +184,8 @@ describe Omnijack::Endpoint::Metadata do
 
   describe '#version' do
     context 'no argument provided' do
+      let(:to_h) { { version: nil } }
+
       it 'returns latest' do
         res = obj
         expect(res.version).to eq('latest')
@@ -195,12 +196,12 @@ describe Omnijack::Endpoint::Metadata do
     context 'a valid argument provided' do
       let(:obj) do
         o = super()
-        o.version('1.2.3') && o
+        o.version('1.2.4') && o
       end
 
       it 'uses the provided arg' do
-        expect(obj.version).to eq('1.2.3')
-        expect(obj.instance_variable_get(:@version)).to eq('1.2.3')
+        expect(obj.version).to eq('1.2.4')
+        expect(obj.instance_variable_get(:@version)).to eq('1.2.4')
       end
     end
 
@@ -390,7 +391,7 @@ describe Omnijack::Endpoint::Metadata do
     end
 
     it 'returns the appropriate metadata endpoint' do
-      expected = URI.parse('https://www.getchef.com/chef/metadata-chefdk?' \
+      expected = URI.parse('https://www.chef.io/chef/metadata-chefdk?' \
                            'v=1.2.3&p=ubuntu&pv=12.04')
       expect(obj.send(:api_url)).to eq(expected)
     end

data/spec/omnijack/endpoint_spec.rb

@@ -134,7 +134,7 @@ describe Omnijack::Endpoint do
     context 'no argument provided' do
       it 'uses the default' do
         res = obj
-        expected = 'https://www.getchef.com/chef'
+        expected = 'https://www.chef.io/chef'
         expect(res.base_url).to eq(expected)
         expect(res.instance_variable_get(:@base_url)).to eq(expected)
       end

data/spec/omnijack/project_spec.rb

@@ -39,7 +39,7 @@ describe Omnijack::Project do
 
     before(:each) do
       allow_any_instance_of(Omnijack::Endpoint::Metadata).to receive(:to_h)
-        .and_return(true)
+        .and_return(version: '1.2.3')
     end
 
     it 'returns a Metadata object' do

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.3.1-1_amd64.deb",
-      "filename": "chefdk_0.3.1-1_amd64.deb",
-      "version": "0.3.1",
+      "url": "https://opscode-omnibus-packages.s3.amazonaws.com/ubuntu/12.04/x86_64/chefdk_0.3.5-1_amd64.deb",
+      "filename": "chefdk_0.3.5-1_amd64.deb",
+      "version": "0.3.5",
       "build": "1",
-      "md5": "23e75ef46f8eb6299c5398fddd093db9",
-      "sha256": "fa75f9ee109f7971fe8420f8e97586d4fa78dac4199b485069909385527968d0"
+      "md5": "cda10f30efd6a80166937668db4a67f7",
+      "sha256": "a81c3dfad698fbb19a6c8e3dd65f04a15fd58a811d99db9c47e5a93e368f341d"
     }
   },
   {
@@ -40,12 +40,12 @@
     "prerelease": false,
     "nightlies": true,
     "expected": {
-      "url": "https://opscode-omnibus-packages.s3.amazonaws.com/ubuntu/12.04/x86_64/chefdk_0.3.1%2B20141023234520-1_amd64.deb",
-      "filename": "chefdk_0.3.1+20141023234520-1_amd64.deb",
-      "version": "0.3.1+20141023234520",
+      "url": "https://opscode-omnibus-packages.s3.amazonaws.com/ubuntu/12.04/x86_64/chefdk_0.3.5%2B20141117085014-1_amd64.deb",
+      "filename": "chefdk_0.3.5+20141117085014-1_amd64.deb",
+      "version": "0.3.5+20141117085014",
       "build": "1",
-      "md5": "9331a1dbd283ec755ba009b41417a4fe",
-      "sha256": "9aa154cf34868848df6acb130d91a3a5c790df48729c6034f94ca61cdc134da3"
+      "md5": "36452d69fe2751a103b0efe45593ee1e",
+      "sha256": "210596c1f5c301fa0a50714b8183e28efcfb2dfee19f7a47bf1e204848022af3"
     }
   },
   {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omnijack
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Jonathan Hartman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-24 00:00:00.000000000 Z
+date: 2014-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json