omnijack 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b2ea25f171c43615082dfb66ccd2bfd0f346a0e
-  data.tar.gz: d4de55724f7cb930ad934fb54e4fdd6a0f0d324a
+  metadata.gz: fc253a8a3bc6dae6c9ab5ca28a1af127cbf8ca98
+  data.tar.gz: 2886b763948b3e3b01d4ca1843b15588f1ee2717
 SHA512:
-  metadata.gz: 190febeaa0f43effe2c66abe12531be60527a3a30331fc6e8d380bfaf7393ee70cf1b46a4f46df86f8a50b441565442bf0f15ea465b1280e13c95f38b70d0698
-  data.tar.gz: 647e33c31230fa4a2079da35dd1aff2ce70574ae1bc48d1518e54237e1fb97297f254d267f0f32d53796a68e6c68acbead9a0ee2551ff5a030d8b5c80c20e04c
+  metadata.gz: 8abff1f3f1bd23af2a420c9718425afc7b2adb65df2e42c5d585d56b3209a8b00a1c78bc69886ccddd1af29206ca8f29d5e2cd402b28ffa8cb43d2c5f243302d
+  data.tar.gz: 085621d8d7d5cce42cc519b56847cfab0a80df7446a8f755adbf2d2f0ddcf8c0e458a1a3922f78cd4f48db3b1489f1c3fa656de10640fe9bb0a0e6228189ecd0

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 Omnijack Gem CHANGELOG
 ======================
 
+v0.2.0 (2014-09-19)
+-------------------
+- Calculate and expose version and build numbers as part of metadata
+- Populate project metadata immediately instead of the first time
+`metadata.to_h` is called
+- Remove version string validation to allow for nightly build versions
+
 v0.1.2 (2014-09-17)
 -------------------
 - Fix encoding issue with incorrect filename for nightly build packages

data/README.md

@@ -51,12 +51,16 @@ puts metadata.filename
 puts metadata.md5
 puts metadata.sha256
 puts metadata.yolo
+puts metadata.version
+puts metadata.build
 
 puts metadata[:url]
 puts metadata[:filename]
 puts metadata[:md5]
 puts metadata[:sha256]
 puts metadata[:yolo]
+puts metadata[:version]
+puts metadata[:build]
 ```
 Getting Chef-DK project data from an unofficial Omnitruck API:
 

data/features/metadata.feature

@@ -11,6 +11,8 @@ Feature: Metadata
     When I create a <Project> project
     Then the metadata has a url attribute
     And the metadata has a filename attribute
+    And the metadata has a version attribute
+    And the metadata has a build attribute
     And the metadata has an md5 attribute
     And the metadata has a sha256 attribute
     And the metadata doesn't have a yolo attribute
@@ -28,6 +30,8 @@ Feature: Metadata
     When I create a <Project> project
     Then the metadata has a url attribute
     And the metadata has a filename attribute
+    And the metadata has a version attribute
+    And the metadata has a build attribute
     And the metadata has an md5 attribute
     And the metadata has a sha256 attribute
     And the metadata has a yolo attribute

data/features/step_definitions/metadata.rb

@@ -8,6 +8,10 @@ Then(/^the metadata (has|doesn't have) a(n)? (\w+) attribute$/) do |has, _, a|
               %r{^https://opscode-omnibus-packages\.s3\.amazonaws\.com.*$}
             when 'filename'
               /^[A-Za-z0-9_\.\-\+]+\.(rpm|deb|pkg|msi)$/
+            when 'version'
+              /^[A-Za-z0-9\.\+]+$/
+            when 'build'
+              /^[0-9]+$/
             when 'md5'
               /^\w{32}$/
             when 'sha256'

data/lib/omnijack/metadata.rb

@@ -32,6 +32,7 @@ class Omnijack
     def initialize(name, args = {})
       super
       args.each { |k, v| send(k, v) unless v.nil? } unless args.nil?
+      to_h
     end
 
     #
@@ -41,6 +42,7 @@ class Omnijack
       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
@@ -60,13 +62,11 @@ class Omnijack
     def to_h
       raw_metadata.split("\n").each_with_object({}) do |line, hsh|
         key = line.split[0].to_sym
-        val = case line.split[1]
-              when 'true' then true
-              when 'false' then false
-              else line.split[1]
-              end
+        val = line.split[1]
+        val = true if val == 'true'
+        val = false if val == 'false'
         hsh[key] = val
-        hsh[:filename] = URI.decode(val).split('/')[-1] if key == :url
+        key == :url && hsh.merge!(parse_url_data(val)) && version(hsh[:version])
       end
     end
 
@@ -82,13 +82,7 @@ class Omnijack
     # @return [String]
     #
     def version(arg = nil)
-      set_or_return(:version,
-                    arg,
-                    kind_of: String,
-                    default: 'latest',
-                    callbacks: {
-                      'Invalid version string' => ->(a) { valid_version?(a) }
-                    })
+      set_or_return(:version, arg, kind_of: String, default: 'latest')
     end
 
     #
@@ -229,14 +223,16 @@ class Omnijack
     end
 
     #
-    # Determine whether a string is a valid version string
+    # Extract a filename, package version, and build from a package URL
     #
-    # @param [String] arg
-    # @return [TrueClass, FalseClass]
+    # @param [String] url
+    # @return [[String] filename, [String] version, [String] build]
     #
-    def valid_version?(arg)
-      return true if arg == 'latest'
-      arg.match(/^[0-9]+\.[0-9]+\.[0-9]+(-[0-9]+)?$/) ? true : false
+    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/lib/omnijack/version.rb

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

data/spec/omnijack/metadata_spec.rb

@@ -25,7 +25,16 @@ describe Omnijack::Metadata do
   let(:args) { nil }
   let(:obj) { described_class.new(name, args) }
 
+  before(:each) do
+    allow_any_instance_of(described_class).to receive(:to_h).and_return(true)
+  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',
@@ -50,7 +59,7 @@ describe Omnijack::Metadata do
     end
   end
 
-  [:url, :md5, :sha256, :yolo, :filename].each do |i|
+  [:url, :md5, :sha256, :yolo, :filename, :build].each do |i|
     describe "##{i}" do
       before(:each) do
         allow_any_instance_of(described_class).to receive(:to_h)
@@ -64,7 +73,9 @@ describe Omnijack::Metadata do
   end
 
   describe '#[]' do
-    let(:attributes) { [:url, :md5, :sha256, :yolo, :filename] }
+    let(:attributes) do
+      [:url, :md5, :sha256, :yolo, :filename, :version, :build]
+    end
 
     before(:each) do
       allow_any_instance_of(described_class).to receive(:to_h)
@@ -74,7 +85,7 @@ describe Omnijack::Metadata do
                     end)
     end
 
-    [:url, :md5, :sha256, :yolo, :filename].each do |a|
+    [:url, :md5, :sha256, :yolo, :filename, :version, :build].each do |a|
       it "returns the correct #{a}" do
         expect(obj[a]).to eq("#{a} things")
       end
@@ -82,7 +93,12 @@ describe Omnijack::Metadata do
   end
 
   describe '#to_h' do
-    context 'fake data' do
+    before(:each) do
+      allow_any_instance_of(described_class).to receive(:to_h)
+        .and_call_original
+    end
+
+    context 'fake normal package data' do
       let(:url) do
         'https://opscode-omnibus-packages.s3.amazonaws.com/el/6/x86_64/' \
           'chefdk-0.2.1-1.el6.x86_64.rpm'
@@ -103,10 +119,16 @@ describe Omnijack::Metadata do
 
       it 'returns the correct result hash' do
         expected = { url: url, md5: md5, sha256: sha256, yolo: yolo,
-                     filename: 'chefdk-0.2.1-1.el6.x86_64.rpm' }
+                     filename: 'chefdk-0.2.1-1.el6.x86_64.rpm',
+                     version: '0.2.1', build: '1' }
         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 }
@@ -118,6 +140,35 @@ describe Omnijack::Metadata do
       end
     end
 
+    context 'fake nightly build data' do
+      let(:url) do
+        'https://opscode-omnibus-packages.s3.amazonaws.com/mac_os_x/' \
+          '10.8/x86_64/chefdk-0.2.2%2B20140916163521.git.23.997cf31-1.dmg'
+      end
+      let(:md5) { 'e7f3ab946c851b50971d117bfa0f6e2c' }
+      let(:sha256) do
+        'b9ecab8f2ebb258c3bdc341ab82310dfbfc8b8a5b27802481f27daf607ba7f99'
+      end
+      let(:yolo) { true }
+      let(:raw_metadata) 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)
+      end
+
+      it 'decodes the encoded URL' do
+        expected = {
+          url: url, md5: md5, sha256: sha256, yolo: yolo,
+          filename: 'chefdk-0.2.2+20140916163521.git.23.997cf31-1.dmg',
+          version: '0.2.2+20140916163521.git.23.997cf31', build: '1'
+        }
+        expect(obj.to_h).to eq(expected)
+      end
+    end
+
     json = ::File.open(File.expand_path('../../support/real_test_data.json',
                                         __FILE__)).read
     JSON.parse(json, symbolize_names: true).each do |data|
@@ -131,6 +182,7 @@ describe Omnijack::Metadata do
                               platform_version: data[:platform][:version],
                               machine_arch: 'x86_64')
         end
+
         it 'returns the expected data' do
           if !data[:expected]
             expect { obj.to_h }.to raise_error(OpenURI::HTTPError)
@@ -541,36 +593,65 @@ describe Omnijack::Metadata do
     end
   end
 
-  describe '#valid_version?' do
-    context 'a "latest" version' do
-      let(:res) { obj.send(:valid_version?, 'latest') }
+  describe '#parsed_url_data' do
+    let(:url) { nil }
+    let(:res) { obj.send(:parse_url_data, url) }
 
-      it 'returns true' do
-        expect(res).to eq(true)
+    context 'a standard RHEL package URL' do
+      let(:url) do
+        'https://opscode-omnibus-packages.s3.amazonaws.com/el/6/x86_64/' \
+          'chefdk-0.2.1-1.el6.x86_64.rpm'
+      end
+
+      it 'extracts the right filename' do
+        expect(res[:filename]).to eq('chefdk-0.2.1-1.el6.x86_64.rpm')
       end
-    end
 
-    context 'a valid version' do
-      let(:res) { obj.send(:valid_version?, '1.2.3') }
+      it 'extracts the right version' do
+        expect(res[:version]).to eq('0.2.1')
+      end
 
-      it 'returns true' do
-        expect(res).to eq(true)
+      it 'extracts the right build' do
+        expect(res[:build]).to eq('1')
       end
     end
 
-    context 'a valid version + build' do
-      let(:res) { obj.send(:valid_version?, '1.2.3-12') }
+    context 'a standard Ubuntu package URL' do
+      let(:url) do
+        'https://opscode-omnibus-packages.s3.amazonaws.com/ubuntu/12.04/' \
+          'x86_64/chefdk_0.2.1-1_amd64.deb'
+      end
+
+      it 'extracts the right filename' do
+        expect(res[:filename]).to eq('chefdk_0.2.1-1_amd64.deb')
+      end
 
-      it 'returns true' do
-        expect(res).to eq(true)
+      it 'extracts the right version' do
+        expect(res[:version]).to eq('0.2.1')
+      end
+
+      it 'extracts the right build' do
+        expect(res[:build]).to eq('1')
       end
     end
 
-    context 'an invalid version' do
-      let(:res) { obj.send(:valid_version?, 'x.y.z') }
+    context 'a nightly package URL' do
+      let(:url) do
+        'https://opscode-omnibus-packages.s3.amazonaws.com/mac_os_x/' \
+          '10.8/x86_64/chefdk-0.2.2%2B20140916163521.git.23.997cf31-1.dmg'
+      end
+
+      it 'extracts the right filename' do
+        expected = 'chefdk-0.2.2+20140916163521.git.23.997cf31-1.dmg'
+        expect(res[:filename]).to eq(expected)
+      end
+
+      it 'extracts the right version' do
+        expect(res[:version]).to eq('0.2.2+20140916163521.git.23.997cf31')
+      end
 
-      it 'returns false' do
-        expect(res).to eq(false)
+      it 'extracts the right build' do
+        expect(res[:build]).to eq('1')
       end
     end
   end

data/spec/omnijack/project_spec.rb

@@ -33,6 +33,11 @@ describe Omnijack::Project do
   end
 
   describe '#metadata' do
+    before(:each) do
+      allow_any_instance_of(Omnijack::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|

data/spec/support/real_test_data.json

@@ -7,6 +7,8 @@
     "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",
+      "build": "1",
       "md5": "1b097776840aa10f092063d1579bf155",
       "sha256": "a6384851473779d3b0d0bedc509607b924751ea3b356e7df4b9c7ab16dd25788"
     }
@@ -19,6 +21,8 @@
     "expected": {
       "url": "https://opscode-omnibus-packages.s3.amazonaws.com/ubuntu/12.04/x86_64/chefdk_0.1.0-1_amd64.deb",
       "filename": "chefdk_0.1.0-1_amd64.deb",
+      "version": "0.1.0",
+      "build": "1",
       "md5": "f7d53114f96e927261b4b2a2ecd3f232",
       "sha256": "0d66b93b62a24bd9c9735eefb4cd547bdf441f4a95effdfa068608c3821f85cb"
     }
@@ -36,10 +40,12 @@
     "prerelease": false,
     "nightlies": true,
     "expected": {
-      "url": "https://opscode-omnibus-packages.s3.amazonaws.com/ubuntu/12.04/x86_64/chefdk_0.2.2%2B20140917085111.git.23.997cf31-1_amd64.deb",
-      "filename": "chefdk_0.2.2+20140917085111.git.23.997cf31-1_amd64.deb",
-      "md5": "03af55494419a3b3b32617fb76141ffc",
-      "sha256": "e16c8d8cb594fe0fa82489d348af258f94e3e68ad8392bec31e3f12b5fd80285"
+      "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",
+      "build": "1",
+      "md5": "424793c215d387041a9d620eeab1ed34",
+      "sha256": "801d36aa94aa452dbe81c05eb4422fb022e2e7cba3d35a67f02cfa7416ac628f"
     }
   },
   {
@@ -50,6 +56,8 @@
     "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",
+      "build": "1",
       "md5": "1b097776840aa10f092063d1579bf155",
       "sha256": "a6384851473779d3b0d0bedc509607b924751ea3b356e7df4b9c7ab16dd25788"
     }
@@ -62,6 +70,8 @@
     "expected": {
       "url": "https://opscode-omnibus-packages.s3.amazonaws.com/mac_os_x/10.8/x86_64/chefdk-0.2.2-1.dmg",
       "filename": "chefdk-0.2.2-1.dmg",
+      "version": "0.2.2",
+      "build": "1",
       "md5": "2d0d8881ef6b0cdcbaedfacac2d5129d",
       "sha256": "4922390a2dc08c26947fe8ed94a3a1777bd820e0e409e4072b2fb1315f4425d5"
     }
@@ -74,6 +84,8 @@
     "expected": {
       "url": "https://opscode-omnibus-packages.s3.amazonaws.com/mac_os_x/10.8/x86_64/chefdk-0.2.2-1.dmg",
       "filename": "chefdk-0.2.2-1.dmg",
+      "version": "0.2.2",
+      "build": "1",
       "md5": "2d0d8881ef6b0cdcbaedfacac2d5129d",
       "sha256": "4922390a2dc08c26947fe8ed94a3a1777bd820e0e409e4072b2fb1315f4425d5"
     }
@@ -86,6 +98,8 @@
     "expected": {
       "url": "https://opscode-omnibus-packages.s3.amazonaws.com/el/6/x86_64/chefdk-0.2.2-1.x86_64.rpm",
       "filename": "chefdk-0.2.2-1.x86_64.rpm",
+      "version": "0.2.2",
+      "build": "1",
       "md5": "5da3f329f7e6d51e778212dea4dae73f",
       "sha256": "2bc4c5c6f82ee7abed385d837e526fd40777ddc47ad939e4f3ecea625b43a245"
     }
@@ -98,6 +112,8 @@
     "expected": {
       "url": "https://opscode-omnibus-packages.s3.amazonaws.com/el/6/x86_64/chefdk-0.2.2-1.x86_64.rpm",
       "filename": "chefdk-0.2.2-1.x86_64.rpm",
+      "version": "0.2.2",
+      "build": "1",
       "md5": "5da3f329f7e6d51e778212dea4dae73f",
       "sha256": "2bc4c5c6f82ee7abed385d837e526fd40777ddc47ad939e4f3ecea625b43a245",
       "yolo": true
@@ -111,6 +127,8 @@
     "expected": {
       "url": "https://opscode-omnibus-packages.s3.amazonaws.com/windows/2008r2/x86_64/chefdk-0.2.2-1.msi",
       "filename": "chefdk-0.2.2-1.msi",
+      "version": "0.2.2",
+      "build": "1",
       "md5": "21f9af35451a0116b72531f06e93eb05",
       "sha256": "76038621bad5333b9ceee4dc32325cf2a880fa69ef64a9225d91ab1788c37a53"
     }
@@ -123,6 +141,8 @@
     "expected": {
       "url": "https://opscode-omnibus-packages.s3.amazonaws.com/windows/2008r2/x86_64/chefdk-0.2.2-1.msi",
       "filename": "chefdk-0.2.2-1.msi",
+      "version": "0.2.2",
+      "build": "1",
       "md5": "21f9af35451a0116b72531f06e93eb05",
       "sha256": "76038621bad5333b9ceee4dc32325cf2a880fa69ef64a9225d91ab1788c37a53",
       "yolo": true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omnijack
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Jonathan Hartman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-18 00:00:00.000000000 Z
+date: 2014-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ohai