pgversion 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90ec278816748e4da89d34815910e99bf9bbf9aa
-  data.tar.gz: 9c38557ea8c01b9389f69d3115c0ca1c9bb92f00
+  metadata.gz: 75b2de8ed584defb06c2f2f621e36b0969f85e97
+  data.tar.gz: 86a90c6eba2fa5e15785eb895d38c17ccbe9c5ef
 SHA512:
-  metadata.gz: 2d3a8cd1c9732deedec9824a474eeef46c23ffb57064107a2b1b76be49bf5f64d6dad28826922a9d81da6cf3dd7e561a814d3c43cfda4fd6c0c5a90ef0d22d4f
-  data.tar.gz: f46b7f50651cb77b44118240d7fd3fe03a900a75426181a9522daccef47f389a118507f9384142fe05a086d579be9afbc016b47e97f28cd2e8953991b570668a
+  metadata.gz: fd3ada292981142986f465f2a96a7db39a0c39959f41291ed3d01ef42d22307cf96c09d17ce1bf80d05aa4286bfe101ec889bb981672df0288bd2632ce41a425
+  data.tar.gz: a0a84730c6ae811ed84843f4fc1cf0f4cc83a9f7e494498336dd814d8953d298ada59d2156e7f6679da9d569fe29dfe64a623d987c61e057fe2e4a38ad5bb081

data/lib/pgversion.rb

@@ -5,7 +5,7 @@
 class PGVersion
   include Comparable
 
-  VERSION = "0.0.2"
+  VERSION = "0.0.4"
 
   # The major and minor version taken together determine the stable
   # interface to Postgres. New features may be introduced or breaking
@@ -17,9 +17,8 @@ class PGVersion
   # changes made when either of these change.
   attr_reader :minor
 
-  # The point release, for release states. Note that this may be nil,
-  # which is considered later than all other releases. Always nil
-  # when state is not :release.
+  # The point release, for release states. Always nil when state is
+  # not :release.
   attr_reader :point
 
   # The state of a release: :alpha, :beta, :rc, or :release
@@ -29,7 +28,7 @@ class PGVersion
   # may go through several revisions in that state before moving to
   # the next state. Nil when state is :release.
   attr_reader :revision
-  
+
   # The host architecture of the given binary
   attr_reader :host
   # The compiler used to build the given binary
@@ -58,14 +57,15 @@ class PGVersion
   def initialize(major, minor, point=nil, host: nil, compiler: nil, bit_depth: nil)
     @major = major
     @minor = minor
-    if point.nil? || point.is_a?(Fixnum)
+    if point.is_a?(Integer) || (major >=10 && point.nil?)
       @point = point
       @state = :release
     else
       verstr_states = ALLOWED_STATES.reject { |s| s == :release }.map(&:to_s)
       @state, @revision = point.to_s.match(
                           /(#{verstr_states.join('|')})(\d+)/
-                        ) && $1.to_sym, $2.to_i
+                                          ) && $1.to_sym, $2.to_i
+      @point = nil
       unless @state && @revision
         raise ArgumentError, "Unknown point release: #{point}"
       end
@@ -74,10 +74,8 @@ class PGVersion
     @compiler = compiler
     @bit_depth = bit_depth
   end
- 
-  # Compare to another PGVersion. Note that an unspecified point
-  # release version is considered higher than every point version of
-  # the same state.
+
+  # Compare to another PGVersion.
   def <=>(other)
     if self.major < other.major
       -1
@@ -96,15 +94,7 @@ class PGVersion
         elsif self_state_idx > other_state_idx
           1
         elsif self.state == :release
-          if self.point.nil? && other.point.nil?
-            0
-          elsif other.point.nil?
-            -1
-          elsif self.point.nil?
-            1
-          else
-            self.point <=> other.point
-          end
+          self.point <=> other.point
         else
           self.revision <=> other.revision
         end
@@ -125,7 +115,7 @@ class PGVersion
 
   def to_s
     patch = if release?
-              ".#{point}" unless point.nil?
+              point.nil? ? "" : ".#{point}"
             else
               "#{state}#{revision}"
             end
@@ -147,7 +137,7 @@ class PGVersion
   attr_reader :state
 
   private
-  
-  VERSION_REGEXP = /PostgreSQL (\d+)\.(\d+).?((?:alpha|beta|rc)?\d+) on ([^,]+), compiled by ([^,]+), (\d+)-bit/
+
+  VERSION_REGEXP = /PostgreSQL (\d+)\.(\d+).?((?:alpha|beta|rc)?\d+)? on ([^,]+), compiled by ([^,]+), (\d+)-bit/
   ALLOWED_STATES = %i(alpha beta rc release)
 end

data/spec/pgversion_spec.rb

@@ -11,8 +11,8 @@ describe PGVersion do
       PGVersion.new(9,0,:beta2, host: 'x86_64-unknown-linux-gnu', compiler: 'gcc (Ubuntu 4.8.2-16ubuntu6) 4.8.2', bit_depth: 64),
     "PostgreSQL 8.4alpha3 on x86_64-unknown-linux-gnu, compiled by gcc (Ubuntu 4.8.2-16ubuntu6) 4.8.2, 64-bit" =>
       PGVersion.new(8,4,:alpha3, host: 'x86_64-unknown-linux-gnu', compiler: 'gcc (Ubuntu 4.8.2-16ubuntu6) 4.8.2', bit_depth: 64),
-    "PostgreSQL 10.0.0 on x86_64-unknown-linux-gnu, compiled by gcc (Ubuntu 4.8.2-16ubuntu6) 4.8.2, 64-bit" =>
-      PGVersion.new(10,0,0, host: 'x86_64-unknown-linux-gnu', compiler: 'gcc (Ubuntu 4.8.2-16ubuntu6) 4.8.2', bit_depth: 64)
+    "PostgreSQL 10.0 on x86_64-unknown-linux-gnu, compiled by gcc (Ubuntu 4.8.2-16ubuntu6) 4.8.2, 64-bit" =>
+      PGVersion.new(10,0,nil, host: 'x86_64-unknown-linux-gnu', compiler: 'gcc (Ubuntu 4.8.2-16ubuntu6) 4.8.2', bit_depth: 64)
   }.each do |version_str, version|
     describe '.parse' do
       it "parses #{version_str} into corresponding version #{version}" do
@@ -35,8 +35,7 @@ describe PGVersion do
       PGVersion.new(8,3,:rc1),
       PGVersion.new(8,3,:rc3),
       PGVersion.new(8,3,0),
-      PGVersion.new(8,3,1),
-      PGVersion.new(8,3) ].each do |version|
+      PGVersion.new(8,3,1) ].each do |version|
       it "should format #{version.to_s} as 8.3" do
         expect(version.major_minor).to eq("8.3")
       end
@@ -63,7 +62,6 @@ describe PGVersion do
       PGVersion.new(8,3,:rc3),
       PGVersion.new(8,3,0),
       PGVersion.new(8,3,1),
-      PGVersion.new(8,3),
       PGVersion.new(8,14,0),
       PGVersion.new(9,4,0),
       PGVersion.new(10,0,:alpha1),
@@ -72,10 +70,11 @@ describe PGVersion do
       PGVersion.new(10,0,:beta2),
       PGVersion.new(10,0,:rc1),
       PGVersion.new(10,0,:rc3),
-      PGVersion.new(10,0,0),
-      PGVersion.new(10,0,2),
-      PGVersion.new(10,0,10),
-      PGVersion.new(10,0)
+      PGVersion.new(10,0),
+      PGVersion.new(10,2),
+      PGVersion.new(10,10),
+      PGVersion.new(12,0),
+      PGVersion.new(12,1)
     ].each_with_index.to_a.repeated_permutation(2).each do |(l,lidx), (r,ridx)|
       expected = lidx <=> ridx
       it "compares #{l} to #{r} and gets #{expected}" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pgversion
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - Maciek Sakrejda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-06 00:00:00.000000000 Z
+date: 2017-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -58,7 +58,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Parse Postgres version strings and compare versions