semvergen 1.7.1 → 1.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98d9e63ff3d1b8ae85a03aea47fd84492dda7d2b
-  data.tar.gz: a5a9d66ac74972110d7a21bfb13c6a1656b93a32
+  metadata.gz: 6f8abff57e89ab5b7e430653b7dad3434a059568
+  data.tar.gz: 1e93190c4ed92b2a258694fd4be9952000bfbacf
 SHA512:
-  metadata.gz: 86e174e9a577890b84728c24b190cd92a4acfbe72a78930055ea4ce6b06170cd89a8cf551729bfd9cb10018f3054e18b9d59addf41d8877774fb72d9ec41f494
-  data.tar.gz: 7b5c89bcfffe734092a3366b495a95da4417595507bbf842cf89713124d74964a30154840b0d878eedaae828c3d37ed5afc7828c56ee4d7955958bb79cf2b185
+  metadata.gz: 71c79b8294db32f84a6c0e8fdd83f594746b161a97fefb8b91c7500d9df0e641f98286a06e101c54452ba20521b6659057661212930f51ca00e995f480d032e4
+  data.tar.gz: be1cf9fe8fdc1fc60e306ed4a15d0b8baf77e677b9c7ce79f5436606ec03a588d13b90f135b98035986aa507519fdd8d17f6006e0f04018fc04471a6640f6ac7

data/.ruby-version

@@ -1 +1 @@
-ruby-2.1.0
+ruby-2.3.3

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+# 1.9.1
+* Stage node module's package.json for commit if the file is available
+
+
+# 1.9.0
+* Extend gem to support optional node module bumping
+
+
+# 1.8.1
+* Enforce UTF-8 encoding on changelog file read
+
+
+# 1.8.0
+* Semvergen can release on rubygems.org
+
+
 # 1.7.1
 * Bug fix branch push
 

data/lib/semvergen/bump.rb

@@ -16,9 +16,10 @@ module Semvergen
 
     def_delegators :@interface, :say, :ask, :color, :choose, :newline, :agree
 
-    def initialize(interface, version_file, change_log_file, shell, gem_name, gem_server, notifier)
+    def initialize(interface, version_file, node_version_file, change_log_file, shell, gem_name, gem_server, notifier)
       @interface = interface
       @version_file = version_file
+      @node_version_file = node_version_file
       @change_log_file = change_log_file
       @shell = shell
       @gem_name = gem_name
@@ -125,9 +126,15 @@ module Semvergen
         if agree("Proceed? ")
           @version_file.version = new_version
 
+          node_version_file_path = nil
+          if @node_version_file
+            @node_version_file.version = new_version
+            node_version_file_path = @node_version_file.path
+          end
+
           @change_log_file << change_log_message
 
-          @shell.commit(@version_file.path, new_version, commit_message, features)
+          @shell.commit(@version_file.path, node_version_file_path, new_version, commit_message, features)
 
           @shell.push(new_version)
 
@@ -137,6 +144,7 @@ module Semvergen
         Semvergen::Release.new(
           @interface,
           @version_file,
+          @node_version_file,
           @change_log_file,
           @shell,
           @gem_name,

data/lib/semvergen/change_log_file.rb

@@ -7,7 +7,7 @@ module Semvergen
     end
 
     def <<(message)
-      current_change_log = File.exist?(@change_log_filename) ? File.read(@change_log_filename) : ""
+      current_change_log = File.exist?(@change_log_filename) ? File.read(@change_log_filename, :encoding => "UTF-8") : ""
       new_change_log     = "# Changelog\n\n#{message}" + current_change_log.gsub("# Changelog\n", "")
       File.open(@change_log_filename, "w") { |f| f.write new_change_log }
     end

data/lib/semvergen/extensions/node_module/version_file.rb

@@ -0,0 +1,29 @@
+module Semvergen
+  module Extensions
+    module NodeModule
+      class VersionFile
+
+        def initialize(file)
+          @file = file
+        end
+
+        def version=(new_version)
+          content = file.read.gsub(/"version".*$/, %Q["version": "#{new_version}",])
+          file.truncate(0)
+          file.write content
+          file.flush
+        end
+
+        def file
+          @file.rewind
+          @file
+        end
+
+        def path
+          @file.path
+        end
+
+      end
+    end
+  end
+end

data/lib/semvergen/launcher.rb

@@ -3,11 +3,11 @@ module Semvergen
   class Launcher
 
     def bump!(options={})
-      Semvergen::Bump.new(interface, version_file, change_log_file, shell, gem_name, gem_server, notifier).run!(options)
+      Semvergen::Bump.new(interface, version_file, node_version_file, change_log_file, shell, gem_name, gem_server, notifier).run!(options)
     end
 
     def release!(options={})
-      Semvergen::Release.new(interface, version_file, change_log_file, shell, gem_name, gem_server, notifier).run!(options)
+      Semvergen::Release.new(interface, version_file, node_version_file, change_log_file, shell, gem_name, gem_server, notifier).run!(options)
     end
 
     private
@@ -20,6 +20,16 @@ module Semvergen
       end
     end
 
+    def node_version_file
+      if config["node_module"]
+        if File.exist? node_version_path
+          Extensions::NodeModule::VersionFile.new(File.open(node_version_path, "r+"))
+        else
+          interface.fail_exit "A npm style version file should be found at #{node_version_path}"
+        end
+      end
+    end
+
     def change_log_file
       ChangeLogFile.new
     end
@@ -32,6 +42,10 @@ module Semvergen
       File.join("lib", gem_name, "version.rb")
     end
 
+    def node_version_path
+      File.join("package.json")
+    end
+
     def gem_name
       File.basename(gem_spec).gsub(".gemspec", "")
     end
@@ -64,7 +78,7 @@ module Semvergen
 
     def config
       @config ||= if File.exist?(config_path)
-        YAML.load_file(config_path)
+        YAML.load_file(config_path) || {}
       else
         {}
       end

data/lib/semvergen/release.rb

@@ -6,9 +6,10 @@ module Semvergen
 
     def_delegators :@interface, :say, :ask, :color, :choose, :newline, :agree
 
-    def initialize(interface, version_file, change_log_file, shell, gem_name, gem_server, notifier)
+    def initialize(interface, version_file, node_version_file, change_log_file, shell, gem_name, gem_server, notifier)
       @interface = interface
       @version_file = version_file
+      @node_version_file = node_version_file
       @change_log_file = change_log_file
       @shell = shell
       @gem_name = gem_name
@@ -18,6 +19,9 @@ module Semvergen
 
     def run!(options={})
       if agree("Release? ")
+        if @gem_server == "rubygems.org" && !File.exist?(File.expand_path("~/.gem/credentials"))
+          @interface.fail_exit("Could not find rubygems.org credentials file at ~/.gem/credentials. Please make sure this file exists and that it has the correct credentials before continuing.")
+        end
         say "Found gemspec: #{color(@gem_name, :green)}"
         newline
 
@@ -29,6 +33,13 @@ module Semvergen
         @shell.publish(@gem_name, @version_file.version, @gem_server)
         say color("OK", :green, :bold)
 
+        if @node_version_file
+          say color("Publishing to NPM: ")
+          if @shell.publish_node_module.nil?
+            say color("Error: npm CLI not found! Please ensure that 'npm publish' runs successfully", :underline, :red)
+          end
+        end
+
         features = options[:features] || gem_features
         @notifier.gem_published(@gem_name, gem_version, features.join("\n"))
 
@@ -49,4 +60,4 @@ module Semvergen
 
   end
 
-end
+end

data/lib/semvergen/shell.rb

@@ -26,11 +26,14 @@ module Semvergen
       `git rev-list HEAD..@{u} --count`.strip.to_i == 0
     end
 
-    def commit(version_path, new_version, commit_subject, features)
-      commit_body = COMMIT_MESSAGE % [new_version, commit_subject, features.join("\n")]
+    def commit(version_path, node_version_path, new_version, commit_subject, features)
+      commit_body = commit_message(new_version, commit_subject, features.join("\n"))
 
       execute "git add CHANGELOG.md"
       execute "git add #{version_path}"
+      if node_version_path
+        execute "git add #{node_version_path}"
+      end
       execute %Q[git commit -m "#{commit_body}"]
       execute %Q[git tag #{new_version} -a -m "Version: #{new_version} - #{commit_subject}"]
     end
@@ -44,7 +47,15 @@ module Semvergen
     end
 
     def publish(gem_name, version, gem_server)
-      execute "gem inabox #{gem_name}-#{version}.gem --host #{gem_server}"
+      if gem_server == "rubygems.org"
+        publish_to_rubygems(gem_name, version)
+      else
+        publish_to_gemserver(gem_name, version, gem_server)
+      end
+    end
+
+    def publish_node_module
+      execute "npm publish" rescue nil
     end
 
     def cleanup(gem_name, version)
@@ -53,6 +64,14 @@ module Semvergen
 
     private
 
+    def publish_to_gemserver(gem_name, version, gem_server)
+      execute "gem inabox #{gem_name}-#{version}.gem --host #{gem_server}"
+    end
+
+    def publish_to_rubygems(gem_name, version)
+      execute "gem push #{gem_name}-#{version}.gem"
+    end
+
     def execute(command)
       @execute_function[command]
     end
@@ -63,12 +82,10 @@ module Semvergen
       result
     end
 
-    COMMIT_MESSAGE = <<-STR
-Version %s: %s
-
-%s
-    STR
+    def commit_message(new_version, commit_subject, features)
+      "Version #{new_version}: #{commit_subject}\n\n#{features}"
+    end
 
   end
 
-end
+end

data/lib/semvergen/version.rb

@@ -1,3 +1,3 @@
 module Semvergen
-  VERSION = "1.7.1"
+  VERSION = "1.9.1"
 end

data/lib/semvergen.rb

@@ -8,6 +8,8 @@ require "semvergen/change_log_file"
 require "semvergen/shell"
 require "semvergen/version_file"
 
+require "semvergen/extensions/node_module/version_file"
+
 require "yaml"
 
 module Semvergen

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: semvergen
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.9.1
 platform: ruby
 authors:
 - Brendon McLean
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-04 00:00:00.000000000 Z
+date: 2017-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -214,6 +214,7 @@ files:
 - lib/semvergen.rb
 - lib/semvergen/bump.rb
 - lib/semvergen/change_log_file.rb
+- lib/semvergen/extensions/node_module/version_file.rb
 - lib/semvergen/interface.rb
 - lib/semvergen/launcher.rb
 - lib/semvergen/null_notifier.rb
@@ -248,7 +249,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Interactive semantic version and gem publishing