serverspec 0.13.5 → 0.13.6

data/lib/serverspec/type/package.rb

@@ -24,10 +24,48 @@ module Serverspec
         end
       end
 
-      class Version < Gem::Version
+      class Version
+        include Comparable
+
+        attr_reader :epoch, :version
+
+        def initialize(val)
+          matches = val.match(/^(?:(\d+):)?(\d[0-9a-zA-Z.+:~-]*)$/)
+          if matches.nil?
+            raise ArgumentError, "Malformed version number string #{val}"
+          end
+          @epoch = matches[1].to_i
+          @version = matches[2].to_s
+        end
+
         def <=>(other)
-          other = Gem::Version.new(other) if other.is_a?(String)
-          super(other)
+          other = Version.new(other) if other.is_a?(String)
+          rv = @epoch <=> other.epoch
+          return rv if rv != 0
+
+          return ver_array(@version) <=> ver_array(other.version)
+        end
+
+        private
+        def ver_array(val)
+          val = val.dup
+          re = /^(?:(\d+)|(\D+))(.*)$/
+          res = []
+          while !val.empty?
+            matches = val.match(re)
+            if matches[1].nil?
+              # String
+              matches[2].to_s.each_byte do |b|
+                res << ((b == 126) ? -2 : b)
+              end
+            else
+              # Digits
+              res << matches[1].to_i
+            end
+            val = matches[3].to_s
+          end
+          res << -1
+          return res
         end
       end
     end

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "0.13.5"
+  VERSION = "0.13.6"
 end

data/spec/debian/package_spec.rb

@@ -106,3 +106,25 @@ describe package('httpd') do
   its(:version) { should < '2.2.16' }
   its(:command) { should eq "dpkg-query -f '${Status} ${Version}' -W httpd | sed -n 's/^install ok installed //p'" }
 end
+
+# Debian-style versions
+describe package('httpd') do
+  let(:stdout) { "2.2.15-3\n" }
+  its(:version) { should eq '2.2.15-3' }
+  its(:version) { should > '2.2.15' }
+  its(:version) { should < '2.2.16' }
+  its(:version) { should < '2.2.15-4' }
+  its(:version) { should > '2.2.15-3~bpo70+1' }
+end
+
+# With some epoch
+describe package('httpd') do
+  let(:stdout) { "3:2.2.15-3~git20120918+ae4569bc\n" }
+  its(:version) { should eq '3:2.2.15-3~git20120918+ae4569bc' }
+  its(:version) { should > '3:2.2.15-3~git20120912+ae4569bc' }
+  its(:version) { should < '3:2.2.15-3' }
+  its(:version) { should < '3:2.2.15-3+feature1' }
+  its(:version) { should < '4:1.2.15' }
+  its(:version) { should > '2:4.2.15' }
+  its(:version) { should > '14.2.15' }
+end

data/spec/redhat/package_spec.rb

@@ -113,5 +113,6 @@ describe package('httpd') do
   its(:version) { should eq '2.2.15' }
   its(:version) { should > '2.2.14' }
   its(:version) { should < '2.2.16' }
+  its(:version) { should > '2.2.9' }
   its(:command) { should eq "rpm -qi httpd | grep Version | awk '{print $3}'" }
 end

metadata

@@ -1,107 +1,122 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: serverspec
-version: !ruby/object:Gem::Version
-  version: 0.13.5
+version: !ruby/object:Gem::Version 
+  hash: 39
+  prerelease: 
+  segments: 
+  - 0
+  - 13
+  - 6
+  version: 0.13.6
 platform: ruby
-authors:
+authors: 
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-17 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-12-18 00:00:00 +09:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: net-ssh
-  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: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 2.13.0
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rspec
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 59
+        segments: 
+        - 2
+        - 13
+        - 0
         version: 2.13.0
-- !ruby/object:Gem::Dependency
-  name: highline
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: highline
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: specinfra
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.0.14
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: specinfra
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        - 0
+        - 14
         version: 0.0.14
-- !ruby/object:Gem::Dependency
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 1
+        - 3
+        version: "1.3"
   type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: rake
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id006
 description: RSpec tests for your servers configured by Puppet, Chef or anything else
-email:
+email: 
 - gosukenator@gmail.com
-executables:
+executables: 
 - serverspec-init
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -347,31 +362,41 @@ files:
 - spec/windows/service_spec.rb
 - spec/windows/user_spec.rb
 - spec/windows/windows_registry_key_spec.rb
+has_rdoc: true
 homepage: http://serverspec.org/
-licenses:
+licenses: 
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.6.2
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: RSpec tests for your servers configured by Puppet, Chef or anything else
-test_files:
+test_files: 
 - spec/aix/command_spec.rb
 - spec/aix/cron_spec.rb
 - spec/aix/default_gateway_spec.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 38fe820736c3d3acae8f75fa1cabddb397b278bb
-  data.tar.gz: ca918843932de8e2364444c061f026f164d93c01
-SHA512:
-  metadata.gz: ae52d933b5a378722ee36ad8c3712476392a55db75d0455c741d7149ff867f307d20e05fe05fba3f7bff3a5bc58fca9e1e6e969fac529dcfca290dff17f48ba3
-  data.tar.gz: c91ff7550585936cd61873e251ad7b2c6acb97df47a299716cea9831bae023273312e6238b8770d946f92ff69708021fe38841b88813e5863a42984bf188ef7e