semvergen 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e02ad8f4dd53a6c302389c2a8cf964f9ac440b4a
-  data.tar.gz: b87a41c3c1b8ecba73f1c403bea1017d91303261
+  metadata.gz: c8c261bd75260cff24e44263032e7c82fd737630
+  data.tar.gz: 9be85711ee737bc09177a2aab242516eed974d48
 SHA512:
-  metadata.gz: 2b60c0f46e65c8f9b6e333adfc66db4a2819475f823e3c8eb4ae603e6d2e5f6aedb328fc13436b259cec39d3767c2586582f2d488beb2f0181a7e421b0ce06be
-  data.tar.gz: 1d26dd9f007fda192291cf6fc3d267da86188f69fcfc3ecb414f11d77b648758a4c44011a2b05aa946110494fab00e6538cd79c1482201d0e8c200e6bf0b319e
+  metadata.gz: b1d516039ea09de2bc06c3d72863a836ff8154c6acce51fd3bb6b41177c046090286120621f458730b8c1338317ec1868cd511d68a2c25a152b573c83a171dfe
+  data.tar.gz: 1a1167667dcd659fa2dadcd1a035b0b27a1ba84188861abe438da6362106c1d12ae3ed7122a84131b19e8f2b55dd667e798c0e5e08ecf4b14c2f704bb4be50fd

data/.gitignore

@@ -34,4 +34,5 @@ build/
 # unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
 .rvmrc
 
-.gem_server
+.gem_server
+.semvergen

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+# 1.2.0
+* Foo
+
+
 # 1.1.0
 * Push to origin in bump step
 * Release in bump step

data/Gemfile.lock

@@ -1,22 +1,32 @@
 PATH
   remote: .
   specs:
-    semvergen (1.1.0)
+    semvergen (1.2.0)
       geminabox
       highline (~> 1.6)
+      slack-notifier
       thor (~> 0.14)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    binding_of_caller (0.7.2)
+      debug_inspector (>= 0.0.1)
     builder (3.2.2)
-    celluloid (0.15.2)
-      timers (~> 1.1.0)
+    byebug (3.5.1)
+      columnize (~> 0.8)
+      debugger-linecache (~> 1.2)
+      slop (~> 3.6)
+    celluloid (0.16.0)
+      timers (~> 4.0.0)
     coderay (1.1.0)
+    columnize (0.8.9)
+    debug_inspector (0.0.2)
+    debugger-linecache (1.2.0)
     diff-lcs (1.2.5)
     faraday (0.9.0)
       multipart-post (>= 1.2, < 3)
-    ffi (1.9.3)
+    ffi (1.9.6)
     formatador (0.2.5)
     geminabox (0.12.4)
       builder
@@ -24,18 +34,20 @@ GEM
       httpclient (>= 2.2.7)
       nesty
       sinatra (>= 1.2.7)
-    guard (2.6.1)
+    guard (2.8.0)
       formatador (>= 0.2.4)
       listen (~> 2.7)
       lumberjack (~> 1.0)
       pry (>= 0.9.12)
       thor (>= 0.18.1)
-    guard-rspec (4.2.10)
+    guard-rspec (4.3.1)
       guard (~> 2.1)
       rspec (>= 2.14, < 4.0)
     highline (1.6.21)
-    httpclient (2.4.0)
-    listen (2.7.9)
+    hitimes (1.2.2)
+    httpclient (2.5.3.1)
+    interception (0.5)
+    listen (2.7.11)
       celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
@@ -43,10 +55,19 @@ GEM
     method_source (0.8.2)
     multipart-post (2.0.0)
     nesty (1.0.2)
-    pry (0.10.0)
+    pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
+    pry-byebug (2.0.0)
+      byebug (~> 3.4)
+      pry (~> 0.10)
+    pry-rescue (1.4.1)
+      interception (>= 0.5)
+      pry
+    pry-stack_explorer (0.4.9.1)
+      binding_of_caller (>= 0.7)
+      pry (>= 0.9.11)
     rack (1.5.2)
     rack-protection (1.5.3)
       rack
@@ -54,26 +75,28 @@ GEM
     rb-fsevent (0.9.4)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    rspec (3.0.0)
-      rspec-core (~> 3.0.0)
-      rspec-expectations (~> 3.0.0)
-      rspec-mocks (~> 3.0.0)
-    rspec-core (3.0.2)
-      rspec-support (~> 3.0.0)
-    rspec-expectations (3.0.2)
+    rspec (3.1.0)
+      rspec-core (~> 3.1.0)
+      rspec-expectations (~> 3.1.0)
+      rspec-mocks (~> 3.1.0)
+    rspec-core (3.1.7)
+      rspec-support (~> 3.1.0)
+    rspec-expectations (3.1.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.0.0)
-    rspec-mocks (3.0.2)
-      rspec-support (~> 3.0.0)
-    rspec-support (3.0.2)
+      rspec-support (~> 3.1.0)
+    rspec-mocks (3.1.3)
+      rspec-support (~> 3.1.0)
+    rspec-support (3.1.2)
     sinatra (1.4.5)
       rack (~> 1.4)
       rack-protection (~> 1.4)
       tilt (~> 1.3, >= 1.3.4)
-    slop (3.5.0)
+    slack-notifier (1.0.0)
+    slop (3.6.0)
     thor (0.19.1)
     tilt (1.4.1)
-    timers (1.1.0)
+    timers (4.0.1)
+      hitimes
 
 PLATFORMS
   ruby
@@ -81,6 +104,10 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.6)
   guard-rspec (~> 4.0)
+  pry
+  pry-byebug
+  pry-rescue
+  pry-stack_explorer
   rake (~> 10.1)
   rspec (~> 3.0)
   semvergen!

data/lib/semvergen/bump.rb

@@ -16,20 +16,43 @@ module Semvergen
 
     def_delegators :@interface, :say, :ask, :color, :choose, :newline, :agree
 
-    def initialize(interface, version_file, change_log_file, shell, gem_name, gem_server)
+    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)
+      unless @shell.current_branch == "master"
+        say color("You are not on master. It is not recommended to create releases from a branch", :red)
+        newline
+        return unless agree("Proceed anyway? ")
+        newline
+      end
+
+      unless @shell.git_branch_is_tracking?
+        @interface.fail_exit color("This branch is not tracking a remote branch. Aborting...", :red)
+      end
+
+      say "Checking for upstream changes..."
+      @shell.git_fetch
+      newline
+
+      unless @shell.git_up_to_date?
+        @interface.fail_exit color("This branch is not up to date with upstream", :red)
+      end
+
+      say "Git status: #{color("Up to date", :green)}"
+      newline
+
       if @shell.git_index_dirty? && !options[:ignore_dirty]
         say color("Git index dirty. Commit changes before continuing", :red, :bold)
       else
-        say color("Cut new Quattro Release", :white, :underline, :bold)
+        say color("Cut new #{@gem_name} Release", :white, :underline, :bold)
 
         newline
 
@@ -110,7 +133,7 @@ module Semvergen
 
           @shell.commit(@version_file.path, new_version, commit_message, features)
 
-          @shell.push
+          @shell.push(new_version)
 
           newline
         end
@@ -126,6 +149,8 @@ module Semvergen
           say color("Publishing: ")
           @shell.publish(@gem_name, @version_file.version, @gem_server)
           say color("OK", :green, :bold)
+
+          @notifier.gem_published(@gem_name, new_version, change_log_message)
         end
 
       end

data/lib/semvergen/launcher.rb

@@ -3,13 +3,17 @@ module Semvergen
   class Launcher
 
     def bump!(options={})
-      Semvergen::Bump.new(interface, version_file, change_log_file, shell, gem_name, gem_server).run!(options)
+      Semvergen::Bump.new(interface, version_file, change_log_file, shell, gem_name, gem_server, notifier).run!(options)
     end
 
     private
 
     def version_file
-      VersionFile.new(File.open(version_path, "r+"))
+      if File.exist? version_path
+        VersionFile.new(File.open(version_path, "r+"))
+      else
+        interface.fail_exit "A bundler style version file should be found at #{version_path}"
+      end
     end
 
     def change_log_file
@@ -43,6 +47,8 @@ module Semvergen
     def gem_server
       if File.exists?(gem_server_file)
         File.read(gem_server_file)
+      elsif (gem_server = config["gemserver"])
+        gem_server
       else
         interface.fail_exit "To publish, place the url (with optional username and pass) in a .gem_server file"
       end
@@ -52,6 +58,28 @@ module Semvergen
       File.join(".gem_server")
     end
 
+    def config
+      @config ||= if File.exist?(config_path)
+        YAML.load_file(config_path)
+      else
+        {}
+      end
+    end
+
+    def config_path
+      File.join(".semvergen")
+    end
+
+    def notifier
+      if config["slack"]
+        require 'semvergen/slack_notifier'
+        SlackNotifier.new config["slack"]
+      else
+        require 'semvergen/null_notifier'
+        NullNotifier.new
+      end
+    end
+
   end
 
-end
+end

data/lib/semvergen/null_notifier.rb

@@ -0,0 +1,11 @@
+module Semvergen
+
+  class NullNotifier
+
+    def gem_published(gem_name, new_version, change_log_message)
+      # no-op
+    end
+
+  end
+
+end

data/lib/semvergen/shell.rb

@@ -10,16 +10,33 @@ module Semvergen
       execute("git status --porcelain") =~ /^\s*(D|M|A|R|C)\s/
     end
 
+    def current_branch
+      execute("git symbolic-ref --short HEAD").strip
+    end
+
+    def git_fetch
+      `git fetch -q`
+    end
+
+    def git_branch_is_tracking?
+      `git rev-list HEAD..@{u} --count` and return $?.exitstatus == 0
+    end
+
+    def git_up_to_date?
+      `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")]
 
       execute "git add CHANGELOG.md"
       execute "git add #{version_path}"
       execute %Q[git commit -m "#{commit_body}"]
+      execute %Q[git tag #{new_version} -m "Version: #{new_version} - #{commit_subject}"]
     end
 
-    def push(remote_name="origin", branch_name="master")
-      execute "git push #{remote_name} #{branch_name}"
+    def push(new_version, remote_name="origin", branch_name="master")
+      execute "git push -q #{remote_name} #{branch_name} #{new_version}"
     end
 
     def build_gem(gem_name)

data/lib/semvergen/slack_notifier.rb

@@ -0,0 +1,50 @@
+require 'slack-notifier'
+
+module Semvergen
+
+  class SlackNotifier
+
+    def initialize(opts)
+      @webhook_url = opts["webhook_url"]
+      @username    = opts["username"]
+      @icons       = opts["icons"]
+    end
+
+    def gem_published(gem_name, new_version, change_log_message)
+      options = {}
+      options[:icon_url] = @icons.sample if @icons
+      options[:attachments] = [attachment(gem_name, new_version, change_log_message)]
+      notifier.ping "Semvergen: release #{gem_name}", options
+    end
+
+    def notifier
+      @notifier ||= Slack::Notifier.new(
+        @webhook_url,
+        username: @username
+      )
+    end
+
+    def user
+      [
+        ENV["USER"],
+        `whoami`
+      ].compact.detect { |u| !u.nil? }
+    end
+
+    def attachment(gem_name, new_version, change_log_message)
+      {
+        title:     "#{user} has published a new version of '#{gem_name}'",
+        fallback:  change_log_message,
+        fields:    [
+                     {title: "Version", value: new_version},
+                     {title: "Change Log", value: change_log_message}
+
+                   ],
+        color:     "good",
+        mrkdwn_in: ["text", "title", "fallback", "fields"]
+      }
+    end
+
+  end
+
+end

data/lib/semvergen/version.rb

@@ -1,3 +1,3 @@
 module Semvergen
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/lib/semvergen/version_file.rb

@@ -7,7 +7,7 @@ module Semvergen
     end
 
     def version
-      if file.read =~ /VERSION = "(\d+\.\d+\.\d+)"/
+      if file.read =~ /VERSION\s*=\s*["'](\d+\.\d+\.\d+)["']/
         $1
       else
         raise "Don't understand version"

data/lib/semvergen.rb

@@ -7,6 +7,8 @@ require "semvergen/change_log_file"
 require "semvergen/shell"
 require "semvergen/version_file"
 
+require "yaml"
+
 module Semvergen
 
   def self.bump!(options)

data/semvergen.gemspec

@@ -20,9 +20,15 @@ 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_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'
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: semvergen
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Brendon McLean
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-17 00:00:00.000000000 Z
+date: 2014-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: slack-notifier
+  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: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +122,62 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-stack_explorer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-rescue
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - brendon@intellectionsoftware.com
@@ -133,7 +203,9 @@ files:
 - lib/semvergen/change_log_file.rb
 - lib/semvergen/interface.rb
 - lib/semvergen/launcher.rb
+- lib/semvergen/null_notifier.rb
 - lib/semvergen/shell.rb
+- lib/semvergen/slack_notifier.rb
 - lib/semvergen/version.rb
 - lib/semvergen/version_file.rb
 - semvergen.gemspec