rake-xpi 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4567ca075629457c833c159e08894780919d6ed6
-  data.tar.gz: 984963fee639aed5ec1a035cd7f58d898863673b
+  metadata.gz: 0277471b8a2c1a76911021701967aa43e676d73c
+  data.tar.gz: 76d3a1381985bb4d1cdd204e29615a7725bd060d
 SHA512:
-  metadata.gz: 11f6726843f8c77b161fd2e8d24ec620a1c0ea94cefa40cd68306013f75a967393d99d807260a4bb875f2fafb6bcf20288624475c5d62ad7ea4e72d895d53ccd
-  data.tar.gz: 083d6e6c96d96ef6c45f52579fdd496d6a0be1a7dd939a0fa8bae1aed2b02bba3a3100551d5b47053980cf230d172d0090916e6f0416ac628dac16066e84fe43
+  metadata.gz: c294f3ae2c0415e4ff767570179368d4fd3da9acb275eb64d8b14a5f5a3eb44dcf40195f37bef4c9865f1ff53ba2f4875606877e29fbf846de970207fabfca8b
+  data.tar.gz: 828a47bb6eb8120cc5b56acc825a8f825c687084bdf760265a1f3a5749983a8138ef5cfb54a09aebf65e21cf1a8046a769db6bda177ec694272e3cda38f2f58e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rake-xpi (0.0.10)
+    rake-xpi (0.0.11)
       aws-sdk
       github_api
       jwt
@@ -11,6 +11,7 @@ PATH
       recursive-open-struct
       rest-client
       rubyzip (>= 1.0.0)
+      versionomy
       zip-zip
 
 GEM
@@ -23,6 +24,7 @@ GEM
       jmespath (~> 1.0)
     aws-sdk-resources (2.2.31)
       aws-sdk-core (= 2.2.31)
+    blockenspiel (0.5.0)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     domain_name (0.5.20160310)
@@ -67,6 +69,8 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.2)
+    versionomy (0.5.0)
+      blockenspiel (~> 0.5)
     zip-zip (0.3)
       rubyzip (>= 1.0.0)
 

data/Rakefile

@@ -1,38 +1,29 @@
 require 'bundler/gem_tasks'
 require 'fileutils'
 require 'yaml'
-require 'pp'
+require 'versionomy'
 
 task :default => :build
 
-task :bump do
-  gemspec = []
-  bumped = false
-  new = nil
-  IO.readlines('rake-xpi.gemspec').each{|line|
-    if line =~ /spec.version *= *'([0-9\.]+)'/
-      bumped = true
-      old = $1
-      new = old.split('.').collect{|n| Integer(n)}
-      new[-1] += 1
-      new = new.collect{|n| n.to_s}.join('.')
-      line = line.sub(old, new)
-    end
-    gemspec << line
+task :bump, :level do |t, args|
+  level = (args[:level] || :tiny).to_sym
+  level = :tiny if level == :patch
+
+  gemspec = open('rake-xpi.gemspec').read
+  gemspec.sub!(/spec.version\s*=\s*'([\.0-9]+)'/){|match|
+    old = $1
+    new = Versionomy.parse(old).bump(level).to_s
+    puts "#{old} => #{new}"
+    match.sub(old, new)
   }
-  gemspec = gemspec.join('')
-  puts "Now at #{new}"
 
   File.open('rake-xpi.gemspec', 'w'){|f| f.write(gemspec) }
   puts `git add rake-xpi.gemspec Gemfile Gemfile.lock`
 end
 
 task :publish do
-  version = nil
-  IO.readlines('rake-xpi.gemspec').each{|line|
-    version = $1 if line =~ /spec.version *= *'([0-9\.]+)'/
-  }
-  raise "No version found" unless version
+  open('rake-xpi.gemspec').read =~ /spec.version\s*=\s*'([\.0-9]+)'/
+  version = $1 || raise("No version found")
   sh "git add ."
   sh "git commit -m #{version}"
   sh "git tag #{version}"

data/lib/rake/xpi.rb

@@ -13,6 +13,7 @@ require 'tempfile'
 require 'uri'
 require 'yaml'
 require 'zip'
+require 'versionomy'
 
 module Rake
   module XPI
@@ -32,14 +33,9 @@ module Rake
       end
 
       def bump(level=nil)
-        r = release.split('.').collect{|n| Integer(n)}
-        r = case (level || 'patch').intern
-            when :major then [r[0] + 1, 0, 0]
-            when :minor then [r[0], r[1] + 1, 0]
-            when :patch then [r[0], r[1], r[2] + 1]
-            else raise "Unexpected release increase #{level.inspect}"
-            end
-        self.release = r.collect{|n| n.to_s}.join('.')
+        level = (args[:level] || :tiny).to_sym
+        level = :tiny if level == :patch
+        self.release = Versionomy.parse(self.release).bump(level).to_s
       end
 
       def id

data/rake-xpi.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "rake-xpi"
-  spec.version       = '0.0.10'
+  spec.version       = '0.0.11'
   spec.authors       = ["Emiliano Heyns"]
   spec.email         = ["Emiliano.Heyns@iris-advies.com"]
   spec.description   = %q{rake helper to build XPI files}
@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'github_api'
   spec.add_runtime_dependency 'jwt'
   spec.add_runtime_dependency 'multipart-post'
+  spec.add_runtime_dependency 'versionomy'
   spec.add_runtime_dependency 'nokogiri'
   spec.add_runtime_dependency 'rake', '>= 0', '>= 0'
   spec.add_runtime_dependency 'recursive-open-struct'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rake-xpi
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Emiliano Heyns
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: versionomy
+  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: nokogiri
   requirement: !ruby/object:Gem::Requirement