semvergen 1.4.3 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33e0efa2d15e88b158e5f5602bd48b89e7f3c183
-  data.tar.gz: 737cc5a8fd427ce9044cf9eff905f71d6261ebf0
+  metadata.gz: e578b37b3df394a808f5c107e7da0c74aef146ad
+  data.tar.gz: 66ce38c8b3eafb07997ac9657f18dfce607e02cf
 SHA512:
-  metadata.gz: ba69295e2a5f6ba6654db55ddc89f74ce1cb0260dc26e906db9ea1e8403aa296192dd1f30eb0cf153a42b394a02f06f3c40691515a194481cdeef015a1fb72bb
-  data.tar.gz: 2b839174fd0a5a4efbb1c9f3cbf2402bb564e7e6895c7cb7e044fbc2489d11a7e008cbdff6309e0d40e318a4d5aeb004c5ea5a4783bf8ed03b55c1b619776287
+  metadata.gz: 4524b7d8f0b7c07a4127bd5737f06911d57ec7c27abf01bce5d663dcff0b59256fd60c40a7da1fda86fab2510f01c010ae66a71471c5c873d529c6a20d8a2f34
+  data.tar.gz: e5d8fd03abee1b7674859dc485d559e8edc19a4cd771e2ce7a3c61dd4b04823c2a7e2d01073315743b672984d0978015185ef12ebd2d37e4ccd06f2f8077ba5c

data/.gitignore

@@ -5,6 +5,7 @@
 /InstalledFiles
 /pkg/
 /spec/reports/
+/vendor/bundle/
 /test/tmp/
 /test/version_tmp/
 /tmp/
@@ -36,4 +37,4 @@ build/
 
 .gem_server
 .semvergen
-Gemfile.lock
+Gemfile.lock

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+# 1.6.0
+* Make this gem work again
+
+
+# 1.5.0
+* Hardcode git commit subject line
+
+
 # 1.4.3
 * Bugfix
 

data/bin/semvergen

@@ -12,6 +12,11 @@ class SemvergenCLI < Thor
   def bump
     Semvergen.bump!(options)
   end
+
+  desc "release", "Release the current version of this gem"
+  def release
+    Semvergen.release!(options)
+  end
   
 end
 

data/lib/semvergen/bump.rb

@@ -101,11 +101,7 @@ module Semvergen
         say color("Will add the following to CHANGELOG.md", :underline)
         say color(diff_change_log)
 
-        commit_message = ask("Git commit subject line: ") do |q|
-          q.validate                 = /.{10,}/
-          q.responses[:not_valid]    = color("Message must be more than 10 chars", :red)
-          q.responses[:invalid_type] = color("Message must be more than 10 chars", :red)
-        end
+        commit_message = "Version bump: #{new_version}"
 
         newline
 
@@ -119,7 +115,7 @@ module Semvergen
         say color(diff_change_log, :green)
 
         say "Staging files for commit:"
-        say color("* lib/quattro/version.rb", :green)
+        say color("* #{@version_file.path}", :green)
         say color("* CHANGELOG.md", :green)
         newline
 
@@ -138,22 +134,15 @@ module Semvergen
           newline
         end
 
-        if agree("Release? ")
-          say "Found gemspec: #{color(@gem_name, :green)}"
-          newline
-
-          say color("Building gem: ")
-          @shell.build_gem(@gem_name)
-          say color("OK", :green, :bold)
-
-          say color("Publishing: ")
-          @shell.publish(@gem_name, @version_file.version, @gem_server)
-          say color("OK", :green, :bold)
-
-          @notifier.gem_published(@gem_name, new_version, features.join("\n"))
-
-          @shell.cleanup(@gem_name, new_version) rescue say color("Unable to cleanup", :red)
-        end
+        Semvergen::Release.new(
+          @interface,
+          @version_file,
+          @change_log_file,
+          @shell,
+          @gem_name,
+          @gem_server,
+          @notifier
+        ).run!(features: features)
 
       end
     end

data/lib/semvergen/change_log_file.rb

@@ -2,18 +2,35 @@ module Semvergen
 
   class ChangeLogFile
 
+    def initialize(change_log_filename=nil)
+      @change_log_filename = change_log_filename || "CHANGELOG.md"
+    end
+
     def <<(message)
-      current_change_log = File.exist?(change_log_file) ? File.read(change_log_file) : ""
+      current_change_log = File.exist?(@change_log_filename) ? File.read(@change_log_filename) : ""
       new_change_log     = "# Changelog\n\n#{message}" + current_change_log.gsub("# Changelog\n", "")
-      File.open(change_log_file, "w") { |f| f.write new_change_log }
+      File.open(@change_log_filename, "w") { |f| f.write new_change_log }
+    end
+
+    def features(version=nil)
+      features_for_version(version || latest_version)
     end
 
     private
 
-    def change_log_file
-      File.join("CHANGELOG.md")
+    def latest_version
+      lines = File.readlines(@change_log_filename).map { |l| l.chomp }
+      Array(lines.slice_before(/^#/))[1][0].gsub("# ", "")
+    end
+
+    def features_for_version(version)
+      lines = File.readlines(@change_log_filename).map { |l| l.chomp }
+      features = lines.slice_before(/^#/).select { |a| a.first == "# #{version}" }.first[1..-1]
+      features.select do |feature|
+        !feature.empty?
+      end.compact
     end
 
   end
 
-end
+end

data/lib/semvergen/launcher.rb

@@ -6,6 +6,10 @@ module Semvergen
       Semvergen::Bump.new(interface, 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)
+    end
+
     private
 
     def version_file

data/lib/semvergen/release.rb

@@ -0,0 +1,52 @@
+module Semvergen
+
+  class Release
+
+    extend Forwardable
+
+    def_delegators :@interface, :say, :ask, :color, :choose, :newline, :agree
+
+    def initialize(interface, version_file, change_log_file, shell, gem_name, gem_server, notifier)
+      @interface = interface
+      @version_file = version_file
+      @change_log_file = change_log_file
+      @shell = shell
+      @gem_name = gem_name
+      @gem_server = gem_server
+      @notifier = notifier
+    end
+
+    def run!(options={})
+      if agree("Release? ")
+        say "Found gemspec: #{color(@gem_name, :green)}"
+        newline
+
+        say color("Building gem: ")
+        @shell.build_gem(@gem_name)
+        say color("OK", :green, :bold)
+
+        say color("Publishing: ")
+        @shell.publish(@gem_name, @version_file.version, @gem_server)
+        say color("OK", :green, :bold)
+
+        features = options[:features] || gem_features
+        @notifier.gem_published(@gem_name, gem_version, features.join("\n"))
+
+        @shell.cleanup(@gem_name, gem_version) rescue say color("Unable to cleanup", :red)
+      end
+    end
+
+    private
+
+    def gem_version
+      @version_file.version
+    end
+
+    def gem_features
+      @change_log_file.features
+    end
+
+
+  end
+
+end

data/lib/semvergen/version.rb

@@ -1,3 +1,3 @@
 module Semvergen
-  VERSION = "1.4.3"
+  VERSION = "1.6.0"
 end

data/lib/semvergen.rb

@@ -3,6 +3,7 @@ require "semvergen/version"
 require "semvergen/launcher"
 require "semvergen/interface"
 require "semvergen/bump"
+require "semvergen/release"
 require "semvergen/change_log_file"
 require "semvergen/shell"
 require "semvergen/version_file"

data/semvergen.gemspec

@@ -19,16 +19,16 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "highline", "~> 1.6"
   spec.add_runtime_dependency "thor", "~> 0.14"
-  spec.add_runtime_dependency "geminabox"
-  spec.add_runtime_dependency "slack-notifier"
+  spec.add_runtime_dependency "geminabox", "~> 0.12"
+  spec.add_runtime_dependency "slack-notifier", "~> 1.0"
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake", "~> 10.1"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "guard-rspec", "~> 4.0"
-  spec.add_development_dependency "pry"
-  spec.add_development_dependency 'pry-byebug'
-  spec.add_development_dependency 'pry-stack_explorer'
-  spec.add_development_dependency 'pry-rescue'
-
+  spec.add_development_dependency "pry", "~> 0.10"
+  spec.add_development_dependency 'pry-byebug', "~> 2.0"
+  spec.add_development_dependency 'pry-stack_explorer', "~> 0.4"
+  spec.add_development_dependency 'pry-rescue', "~> 1.4"
+  spec.add_development_dependency "simplecov", "~> 0.9"
 end

data/spec/semvergen/bump_spec.rb

@@ -1,5 +1,5 @@
 describe Semvergen::Bump do
-  let(:semvergen) { Semvergen::Bump.new nil, nil, nil, nil }
+  let(:semvergen) { Semvergen::Bump.new nil, nil, nil, nil, nil, nil, nil }
 
   describe :next_version do
     let(:next_version) { semvergen.next_version current_version, release_type }
@@ -22,4 +22,4 @@ describe Semvergen::Bump do
 
   end
 
-end
+end

data/spec/semvergen/change_log_file_spec.rb

@@ -0,0 +1,36 @@
+describe Semvergen::ChangeLogFile do
+
+  let(:changelog_filename) { "spec/support/CHANGELOG.md" }
+  let(:changelog_file) { Semvergen::ChangeLogFile.new(changelog_filename) }
+
+  describe :features do
+
+    context "latest version" do
+
+      it "returns the correct features" do
+        expect(changelog_file.features).to include("* Feature 1", "* Feature 2", "* Feature 3")
+      end
+
+      it "does not include extra features" do
+        expect(changelog_file.features.count).to eq(3)
+      end
+
+    end
+
+    context "specified version" do
+      let(:version) { "1.1.3" }
+      let(:features) { changelog_file.features(version) }
+
+      it "returns the correct features" do
+        expect(features).to include("* feature", "* another feature")
+      end
+
+      it "does not include extra features" do
+        expect(features.count).to eq(2)
+      end
+
+    end
+
+  end
+
+end

data/spec/spec_helper.rb

@@ -1,19 +1,18 @@
-# This file was generated by the `rspec --init` command. Conventionally, all
-# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
-# The generated `.rspec` file contains `--require spec_helper` which will cause this
-# file to always be loaded, without a need to explicitly require it in any files.
-#
-# Given that it is always loaded, you are encouraged to keep this file as
-# light-weight as possible. Requiring heavyweight dependencies from this file
-# will add to the boot time of your test suite on EVERY test run, even for an
-# individual file that may not need all of that loaded. Instead, make a
-# separate helper file that requires this one and then use it only in the specs
-# that actually need it.
-#
-# The `.rspec` file also contains a few flags that are not defaults but that
-# users commonly want.
-#
-# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+require "simplecov"
+
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+  SimpleCov::Formatter::HTMLFormatter
+]
+
+SimpleCov.start do
+  add_filter "/spec/"
+  add_filter "/vendor/bundle"
+end
+
+if ENV['CIRCLE_ARTIFACTS']
+  dir = File.join("..", "..", "..", ENV['CIRCLE_ARTIFACTS'], "coverage")
+  SimpleCov.coverage_dir(dir)
+end
 
 require 'semvergen'
 

data/spec/support/CHANGELOG.md

@@ -0,0 +1,10 @@
+# Changelog
+
+# 1.1.4
+* Feature 1
+* Feature 2
+* Feature 3
+
+# 1.1.3
+* feature
+* another feature

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: semvergen
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.6.0
 platform: ruby
 authors:
 - Brendon McLean
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-03 00:00:00.000000000 Z
+date: 2015-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -42,30 +42,30 @@ dependencies:
   name: geminabox
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.12'
 - !ruby/object:Gem::Dependency
   name: slack-notifier
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -126,58 +126,72 @@ dependencies:
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: pry-stack_explorer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: pry-rescue
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
 description: 
 email:
 - brendon@intellectionsoftware.com
@@ -203,14 +217,17 @@ files:
 - lib/semvergen/interface.rb
 - lib/semvergen/launcher.rb
 - lib/semvergen/null_notifier.rb
+- lib/semvergen/release.rb
 - lib/semvergen/shell.rb
 - lib/semvergen/slack_notifier.rb
 - lib/semvergen/version.rb
 - lib/semvergen/version_file.rb
 - semvergen.gemspec
 - spec/semvergen/bump_spec.rb
+- spec/semvergen/change_log_file_spec.rb
 - spec/semvergen/shell_spec.rb
 - spec/spec_helper.rb
+- spec/support/CHANGELOG.md
 homepage: https://github.com/brendon9x/semvergen
 licenses:
 - MIT
@@ -237,5 +254,7 @@ specification_version: 4
 summary: Interactive semantic version and gem publishing
 test_files:
 - spec/semvergen/bump_spec.rb
+- spec/semvergen/change_log_file_spec.rb
 - spec/semvergen/shell_spec.rb
 - spec/spec_helper.rb
+- spec/support/CHANGELOG.md