rworkflow 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a21aaa1eb7353e45eb10cf8498ed9c8ae9cebfc
-  data.tar.gz: 05a018eb4b27041ed86515cb7db4e2c945708368
+  metadata.gz: 22961811d932301219dc5196b2fb08a94f70b644
+  data.tar.gz: 32791b0a336f8aeb4d3b38ccca801e87e488b8db
 SHA512:
-  metadata.gz: f304c504e1f537f0430f94739997c858b23d2308844796d00b2bc40fb74be22cdbd0f018d6b004e60e05538e4c3283ba969ac5572ef967257e91c3cd4d5f611d
-  data.tar.gz: d89cddce1e44a96ef6252ff43a528780b7f4c023ee9e83d93bf08d679448704341a61614dec068dc73a1d028279f9c94c44641078bdb40449611426c5b96164b
+  metadata.gz: e55d2d88e77d25f6fe7f617c836aeeea618ca4c3b40eeee5d879c61590a961a5cc3b99caa1ddc1a6c170179d0584000797913bb6d71e7e0846994893f4bb4ad9
+  data.tar.gz: e8ca260c885feb78bda7d0465c7377fee6371ee69114dab442931ab156418122299346aa4b3c32eb92c4bd185b947bdb68d843a81641e377153dccd0d143efe5

data/Rakefile

@@ -30,7 +30,7 @@ task default: :test
 namespace :cim do
   desc 'Tags, updates README, and CHANGELOG and pushes to Github. Requires ruby-git'
   task :release do
-    tasks = ['cim:assert_clean_repo', 'cim:git_fetch', 'cim:assert_version', 'cim:update_readme', 'cim:update_changelog', 'cim:commit_changes', 'cim:tag']
+    tasks = ['cim:assert_clean_repo', 'cim:git_fetch', 'cim:set_new_version', 'cim:update_readme', 'cim:update_changelog', 'cim:commit_changes', 'cim:tag']
     begin
       tasks.each { |task| Rake::Task[task].invoke }
       `git push && git push origin '#{Rworkflow::VERSION}'`
@@ -42,17 +42,17 @@ namespace :cim do
   desc 'Fails if the current repository is not clean'
   task :assert_clean_repo do
     status = `git status -s`.chomp.strip
-    if status.empty?
+    if status.strip.empty?
       status = `git log origin/master..HEAD`.chomp.strip # check if we have unpushed commits
-      if status.empty?
-        puts ">>> Repository is clean!"
+      if status.strip.empty?
+        puts '>>> Repository is clean!'
       else
-        puts ">>> Please push your committed changes before releasing!"
-        exit -1
+        puts '>>> Please push your committed changes before releasing!'
+        exit(-1)
       end
     else
-      puts ">>> Please stash or commit your changes before releasing!"
-      exit -1
+      puts '>>> Please stash or commit your changes before releasing!'
+      exit(-1)
     end
   end
 
@@ -62,14 +62,35 @@ namespace :cim do
     `git fetch --tags`
   end
 
-  desc 'Fails if the current gem version is not greater than the last tag'
-  task :assert_version do
-    latest = `git describe --abbrev=0`.chomp.strip
-    current = Rworkflow::VERSION
+  desc 'Requests the new version number'
+  task :set_new_version do
+    STDOUT.print(">>> New version number (current: #{Rworkflow::VERSION}; leave blank if already updated): ")
+    input = STDIN.gets.strip.tr("'", "\'")
+
+    current = if input.empty?
+      Rworkflow::VERSION
+    else
+      unless input =~ /[0-9]+\.[0-9]+\.[0-9]+/
+        puts '>>> Please use semantic versioning!'
+        exit(-1)
+      end
 
+      input
+    end
+
+    latest = `git describe --abbrev=0`.chomp.strip
     unless Gem::Version.new(current) > Gem::Version.new(latest)
       puts ">>> Latest tagged version is #{latest}; make sure gem version (#{current}) is greater!"
-      exit -1
+      exit(-1)
+    end
+
+    if !input.empty?
+      `sed -i -u "s@VERSION = '#{Rworkflow::VERSION}'@VERSION = '#{input}'@" #{File.expand_path('../lib/rworkflow/version.rb', __FILE__)}`
+      $VERBOSE = nil
+      Rworkflow.const_set('VERSION', input)
+      $VERBOSE = false
+
+      `bundle check` # force updating version
     end
   end
 
@@ -90,10 +111,13 @@ namespace :cim do
     changelog = File.open('.CHANGELOG.md', 'w')
     changelog.write("# Changelog\n\n###{Rworkflow::VERSION}\n\n#{log}\n\n")
     File.open('CHANGELOG.md', 'r') do |file|
-      file.readline # skip first two lines
-      file.readline
-      while buffer = file.read(2048)
-        changelog.write(buffer)
+      begin
+        file.readline # skip first two lines
+        file.readline
+        while buffer = file.read(2048)
+          changelog.write(buffer)
+        end
+      rescue => error
       end
     end
 
@@ -110,7 +134,7 @@ namespace :cim do
   desc 'Creates and pushes the tag to git'
   task :tag do
     puts '>>> Tagging'
-    message = STDOUT.print ">>> Please enter a tag message: "
+    STDOUT.print('>>> Please enter a tag message: ')
     input = STDIN.gets.strip.tr("'", "\'")
     `git tag -a '#{Rworkflow::VERSION}' -m '#{input}'`
   end

data/lib/rworkflow/version.rb

@@ -1,3 +1,3 @@
 module Rworkflow
-  VERSION = '0.6.1'.freeze
+  VERSION = '0.6.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rworkflow
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - barcoo
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement