poise-boiler 1.1.11 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c57f0874cd6f3de21e85242546d75f7697155947
-  data.tar.gz: 45f94bce4cfea5c06202a51cdc09c04dddaaa26b
+  metadata.gz: 72e3c9430dc7859ededecfbd2c4ada39ec9e7434
+  data.tar.gz: bf5924d728d0f96841d5c0fa88594444666fac4a
 SHA512:
-  metadata.gz: 59f322469323237e2b8069aecd7e2c37b50209f174593d4d530735d3a8520a1cb428e85ef5ed1914c3fc60528284ec946eb062fa974077d5f78bc91d40e2cd87
-  data.tar.gz: 58ed212f372a7a488459f9d555c9b8fe7a206748c55688e138f589a043c76dcf287360b829430f1e0fadf07a0145ceee28f599ae301a98c44f2958a3136d3c3b
+  metadata.gz: 63e59107f784622d23f813785a6924e449aeb842f11496dfed5dc22e8156ab905f887b08dcfd39389aa20640640c14c0bd0cd4b408831c856e0952125fcd26a0
+  data.tar.gz: ab1c13de56d88922fb0a1a9f861d7e5ac5e5f6f9d63785be34bd52020622560915bcdd55cc2d58b10347b795eab464b4911cff197afb1f047245ea77c814bf3c

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## v1.2.0
+
+* A full suite of release automation commands.
+* Re-add the `travis` gem as a dependency now that it has removed the ancient
+  `pry` it depended on.
+* Improved handling for setting test verbosity in a unified way.
+
 ## v1.1.11
 
 * Make sure `ss` is available on EL7 for `port` resources in Serverspec.

data/README.md

@@ -46,6 +46,41 @@ and a `spec` task to run unit tests.
 require 'poise_boiler/rakefile'
 ```
 
+### Rake Tasks
+
+#### `test`
+
+Run all tests, specs, foodcritic, and kitchen.
+
+#### `spec`
+
+Run Rspec tests.
+
+#### `badges`
+
+Generate README badges for a project.
+
+#### `debug`, `quiet`, `verbose`
+
+Set the relevant mode environment variables. Can be abbreviated `d`, `q`, and `v`.
+
+#### `check`
+
+List uncommitted file changes and commits since the last release.
+
+#### `checkall`
+
+Run `quiet check` for all projects. This is specific to my folder layout and is
+less likely to work for others.
+
+#### `travis`
+
+Run tests for Travis CI. This does some setup and then runs `rake test`.
+
+#### `release`, `release:minor`, `release:major`
+
+Create a new release and push toe RubyGems and Supermarket.
+
 ## `.kitchen.yml`
 
 The `.kitchen.yml` helper sets up a default driver and default values for

data/lib/poise_boiler/helpers/rake/bump.rb

@@ -0,0 +1,126 @@
+#
+# Copyright 2015, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'git'
+
+require 'halite/helper_base'
+
+
+module PoiseBoiler
+  module Helpers
+    class Rake
+      # Helper methods for bumping gem versions.
+      #
+      # @api private
+      # @since 1.2.0
+      module BumpHelpers
+        VERSION_CONST = /(^\s*VERSION = ['"])([^'"]+)(['"]\s*$)/
+
+        def latest_tag
+          git = Git.open(base)
+          if git.tags.empty?
+            nil
+          else
+            tag_name = git.tags.last.name
+            if tag_name =~ /^v(.*)$/
+              $1
+            else
+              tag_name
+            end
+          end
+        end
+
+        def bumped_version(type: :patch, release: false)
+          current_version = latest_tag
+          next_version = if current_version
+            parts = current_version.split(/\./).map(&:to_i)
+            bump_index = {major: 0, minor: 1, patch: 2}[type]
+            parts[bump_index] += 1
+            (bump_index+1..2).each {|n| parts[n] = 0 }
+            parts.map(&:to_s).join('.')
+          else
+            '1.0.0'
+          end
+          # Release mode means plain, otherwise .pre.
+          if release
+            next_version
+          else
+            next_version + '.pre'
+          end
+        end
+
+        def find_version_rb
+          candidates = Dir[File.join(base, 'lib', '**', 'version.rb')]
+          candidates.min_by {|path| path.size }
+        end
+
+        def bump_version!(type: :patch, release: false, &block)
+          version_rb_path = find_version_rb
+          raise "Unable to find a version.rb in #{base}" unless version_rb_path
+          shell.say("Bumping version in #{version_rb_path}") if ENV['DEBUG']
+          content = IO.read(version_rb_path)
+          raise "Unable to find current version in #{version_rb_path}" unless VERSION_CONST =~ content
+          current_version = $2
+          version = bumped_version(type: type, release: release)
+          shell.say("Bumping gem version from #{current_version} to #{version}")
+          new_content = content.gsub(VERSION_CONST, "\\1#{version}\\3")
+          IO.write(version_rb_path, new_content)
+          begin
+            block.call if block
+          rescue Exception
+            # Restore the original version if anything goes wrong.
+            IO.write(version_rb_path, content)
+            raise
+          end
+        end
+      end
+
+      # Helper for a Rakefile to install tasks for bumping gem versions.
+      #
+      # @since 1.2.0
+      # @example Installing tasks
+      #   require 'poise_boiler/helpers/rake/bump'
+      #   PoiseBoiler::Helpers::Rake::Bump.install
+      # @example Bumping a patch version
+      #   $ rake release:bump
+      # @example Bumping a minor version
+      #   $ rake release:bump:minor
+      class Bump < Halite::HelperBase
+        include BumpHelpers
+
+        # Install the rake tasks.
+        #
+        # @return [void]
+        def install
+          # Delayed so that Rake doesn't need to be loaded to run this file.
+          extend ::Rake::DSL
+
+          task 'release:bump' do
+            bump_version!(type: :patch)
+          end
+
+          task 'release:bump:minor' do
+            bump_version!(type: :minor)
+          end
+
+          task 'release:bump:major' do
+            bump_version!(type: :major)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/poise_boiler/helpers/rake/check.rb

@@ -0,0 +1,166 @@
+#
+# Copyright 2015, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'git'
+
+require 'halite/helper_base'
+
+
+module PoiseBoiler
+  module Helpers
+    class Rake
+      # Helper for a Rakefile to install tasks for checking the state of projects.
+      #
+      # @since 1.2.0
+      # @example Installing tasks
+      #   require 'poise_boiler/helpers/rake/check'
+      #   PoiseBoiler::Helpers::Rake::Check.install
+      # @example Checking the current project
+      #   $ rake release:check
+      class Check < Halite::HelperBase
+        # Install the rake tasks.
+        #
+        # @return [void]
+        def install
+          # Delayed so that Rake doesn't need to be loaded to run this file.
+          extend ::Rake::DSL
+
+          desc 'Check for unreleased commits'
+          task 'release:check' do
+            check_project(base, summary: !!ENV['QUIET'])
+          end
+
+          desc 'Check for unreleased commits in all projects'
+          task 'release:checkall' do
+            base_path = File.expand_path(ENV['POISE_ROOT'] || '~/src')
+            Dir.foreach(base_path) do |entry|
+              next unless entry =~ /^(poise|application|halite)/
+              next if entry =~ /^(application_examples|poise-docker|poise-dash|poise\.io|poise-repomgr)/
+              path = File.join(base_path, entry)
+              next unless Dir.exist?(File.join(path, '.git'))
+              check_project(path, header: "# #{entry}", summary: !ENV['VERBOSE'])
+            end
+          end
+
+          # Aliases for less typing.
+          task 'check' => %w{release:check}
+          task 'checkall' => %w{release:checkall}
+        end
+
+        private
+
+        # Check a project for changes.
+        #
+        # @param path [String] Path to the project's git repository.
+        # @return [void]
+        def check_project(path, header: nil, summary: false)
+          git = Git.open(path)
+          # Some checks for repos that aren't full projects.
+          return unless git.branches['master']
+          return unless git.remote('origin').url
+          changed = check_changed_files(git)
+          commits = check_commits(git)
+          shell.say(header, :blue) unless !header || (changed.empty? && commits.empty?)
+          display_changed_files(changed, summary: summary) unless changed.empty?
+          display_commits(commits, summary: summary) unless commits.empty?
+        end
+
+        # Check for changed files, including new/untracked files.
+        #
+        # @params git [Git::Base] Git repository to operate on.
+        # @return [Array]
+        def check_changed_files(git)
+          git.status.select {|file| file.type || file.untracked }
+        end
+
+        # Display changed files.
+        #
+        # @params changed [Array] Output from {#check_changed_file}
+        # @return [void]
+        def display_changed_files(changed, summary: false)
+          shell.say("#{changed.size} file#{changed.size > 1 ? 's' : ''} with pending changes", :yellow)
+          return if summary
+          changed.each do |file|
+            color = if file.type == 'A' || file.untracked
+              :green
+            elsif file.type == 'D'
+              :red
+            end
+            shell.say("#{file.type || 'U'} #{file.path}", color)
+          end
+        end
+
+        # Check for any commits that are not part of a release. Unpushed commits
+        # are displayed in red.
+        #
+        # @params git [Git::Base] Git repository to operate on.
+        # @return [Array]
+        def check_commits(git)
+          # Find either the latest tag (release) or the first commit in the repo.
+          last_release = if git.tags.empty?
+            git.log.last
+          else
+            git.tags.last
+          end
+
+          # Find all commits since the last release that are not only version bumps.
+          commits = git.log.between(last_release.sha, 'master').select do |commit|
+            if commit.message !~ /^bump.*for/i
+              changed_files = commit.diff_parent.stats[:files].keys
+              if changed_files.size != 1 || changed_files.first !~ /lib\/.*\/version\.rb/
+                true
+              end
+            end
+          end
+
+          # Find all pushed commits since the last release.
+          pushed_commits = git.log.between(last_release.sha, 'origin/master').inject(Set.new) do |memo, commit|
+            memo << commit.sha
+            memo
+          end
+
+          commits.map {|commit| [commit, pushed_commits.include?(commit.sha), last_release] }
+        end
+
+        # Display commits.
+        #
+        # @params changed [Array] Output from {#check_commits}
+        # @return [void]
+        def display_commits(commits, summary: false)
+          unpushed_count = commits.inject(0) {|memo, (_, pushed)| memo + (pushed ? 0 : 1) }
+          shell.say("#{commits.size} commit#{commits.size > 1 ? 's' : ''} #{unpushed_count > 0 ? "(#{unpushed_count} unpushed) " : ''}since #{commits.first[2].name}", unpushed_count > 0 ? :red : :yellow)
+          return if summary
+          commits.each do |commit, pushed|
+            color = pushed ? nil : :red
+            message = commit.message.strip
+            if message.empty?
+              shell.say("* #{commit.sha}", color)
+            else
+              message_lines = commit.message.strip.split(/\n/)
+              first_line = message_lines.shift
+              shell.say("* #{first_line}", color)
+              # Filter down to only the first para and indent to match the '* '.
+              message_lines = message_lines.take_while {|line| !line.strip.empty? }.map! {|line| '  '+line }
+              shell.say(message_lines.join("\n"), color) unless message_lines.empty?
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end

data/lib/poise_boiler/helpers/rake/core.rb

@@ -46,7 +46,7 @@ module PoiseBoiler
             t.rspec_opts = [].tap do |a|
               a << '--color'
               a << "--format #{ENV['CI'] ? 'documentation' : 'Fuubar'}"
-              a << '--backtrace' if ENV['DEBUG']
+              a << '--backtrace' if ENV['VERBOSE'] || ENV['DEBUG']
               a << "--seed #{ENV['SEED']}" if ENV['SEED']
               a << "--tag #{args[:tag]}" if args[:tag]
               a << "--default-path test"

data/lib/poise_boiler/helpers/rake/debug.rb

@@ -0,0 +1,71 @@
+#
+# Copyright 2015, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'halite/helper_base'
+
+
+module PoiseBoiler
+  module Helpers
+    class Rake
+      # Helper for a Rakefile to install tasks for managing verbose/debug output.
+      #
+      # @since 1.2.0
+      # @example Installing tasks
+      #   require 'poise_boiler/helpers/rake/debug'
+      #   PoiseBoiler::Helpers::Rake::Debug.install
+      # @example Runng a task in verbose mode
+      #   $ rake verbose release
+      # @example Runng a task in debug mode
+      #   $ rake debug release
+      class Debug < Halite::HelperBase
+        # Install the rake tasks.
+        #
+        # @return [void]
+        def install
+          # Delayed so that Rake doesn't need to be loaded to run this file.
+          extend ::Rake::DSL
+
+          desc 'Run further tasks in verbose mode'
+          task 'verbose' do
+            ENV['VERBOSE'] = '1'
+            ENV['DEBUG'] = nil
+            ENV['QUIET'] = nil
+          end
+
+          desc 'Run further tasks in debug mode'
+          task 'debug' do
+            ENV['VERBOSE'] = '1'
+            ENV['DEBUG'] = '1'
+            ENV['QUIET'] = nil
+          end
+
+          desc 'Run further tasks in quiet mode'
+          task 'quiet' do
+            ENV['VERBOSE'] = nil
+            ENV['DEBUG'] = nil
+            ENV['QUIET'] = '1'
+          end
+
+          # Short alises.
+          task 'v' => %w{verbose}
+          task 'd' => %w{debug}
+          task 'q' => %w{quiet}
+        end
+
+      end
+    end
+  end
+end

data/lib/poise_boiler/helpers/rake/release.rb

@@ -0,0 +1,148 @@
+#
+# Copyright 2015, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'halite/helper_base'
+
+require_relative 'bump'
+
+module PoiseBoiler
+  module Helpers
+    class Rake
+      # Helper for a Rakefile to install tasks for managing verbose/debug output.
+      #
+      # @since 1.2.0
+      # @example Installing tasks
+      #   require 'poise_boiler/helpers/rake/debug'
+      #   PoiseBoiler::Helpers::Rake::Debug.install
+      # @example Runng a task in verbose mode
+      #   $ rake verbose release
+      # @example Runng a task in debug mode
+      #   $ rake debug release
+      class Release < Halite::HelperBase
+        include BumpHelpers
+
+        # Install the rake tasks.
+        #
+        # @return [void]
+        def install
+          # Delayed so that Rake doesn't need to be loaded to run this file.
+          extend ::Rake::DSL
+
+          # Rename the original release task.
+          release_task = ::Rake.application.lookup('release')
+          if release_task
+            release_actions = release_task.actions.dup
+            task 'release:original' => release_task.prerequisites.dup do
+              release_actions.map(&:call)
+            end
+            release_task.clear
+          end
+
+          # No-op Bundler's release:source_control_push task.
+          source_control_push_task = ::Rake.application.lookup('release:source_control_push')
+          source_control_push_task.clear if source_control_push_task
+
+          # Tag the release.
+          task 'release:tag' do
+            tag_release!(commit: false)
+          end
+
+          # Make the new release tasks.
+          desc "Bump, tag, and release #{gem_name}"
+          task 'release' do
+            release_gem!(:patch)
+          end
+
+          desc "Bump minor, tag, and release #{gem_name}"
+          task 'release:minor' do
+            release_gem!(:minor)
+          end
+
+          desc "Bump major, tag, and release #{gem_name}"
+          task 'release:major' do
+            release_gem!(:major)
+          end
+        end
+
+        private
+
+        def use_signed_tags?
+          !!sh('git config user.signingkey >/dev/null', verbose: false) {|ok, status| ok }
+        end
+
+        def find_current_version
+          version_rb = find_version_rb
+          if version_rb
+            (IO.read(version_rb) =~ Bump::VERSION_CONST) && $2
+          else
+            nil
+          end
+        end
+
+        def git_commit!(message)
+          sh(*['git', 'add', find_version_rb])
+          commit_cmd = ['git', 'commit', '-m', message]
+          sh(*commit_cmd)
+        end
+
+        def tag_release!(commit: true, &block)
+          # I can't use the gemspec because we might have changed the version.
+          current_version = find_current_version
+          unless current_version
+            raise "Unable to find current version of #{gem_name}"
+          end
+          if Gem::Version.create(current_version).prerelease?
+            raise "#{gem_name} has a prerelease version: #{current_version}"
+          end
+          unless File.exist?('CHANGELOG.md') && IO.read('CHANGELOG.md').include?("## v#{current_version}\n")
+            raise "No changelog entry found for #{current_version}"
+          end
+          answer = shell.ask("Are you certain you want to release #{gem_name} v#{current_version}?", limited_to: %w{y n})
+          if answer == 'n'
+            raise 'Aborting release'
+          end
+          git_commit!('Bump version for release.') if commit
+          tag_cmd = %w{git tag -a}
+          tag_cmd << '-s' if use_signed_tags?
+          tag_cmd.concat(['-m', "Release #{current_version}", "v#{current_version}"])
+          sh(*tag_cmd)
+          begin
+            block.call if block
+          rescue Exception
+            sh(*['git', 'tag', '-d', "v#{current_version}"])
+            raise
+          end
+        end
+
+        def release_gem!(bump_type)
+          ::Rake::Task['release:guard_clean'].invoke
+          bump_version!(type: bump_type, release: true) do
+            tag_release! do
+              # Run this as a subproc so it reloads the gemspec. Probably not
+              # as reliable as invoke, but safer.
+              sh(*['rake', 'release:original'], verbose: false)
+            end
+          end
+          bump_version!(type: :patch)
+          git_commit!('Bump version for dev.')
+          sh(*['git', 'push'])
+          sh(*['git', 'push', '--tags'])
+        end
+
+      end
+    end
+  end
+end

data/lib/poise_boiler/helpers/rake.rb

@@ -27,7 +27,11 @@ module PoiseBoiler
     # @see Travis
     class Rake < Halite::HelperBase
       autoload :Badges, 'poise_boiler/helpers/rake/badges'
+      autoload :Bump, 'poise_boiler/helpers/rake/bump'
+      autoload :Check, 'poise_boiler/helpers/rake/check'
       autoload :Core, 'poise_boiler/helpers/rake/core'
+      autoload :Debug, 'poise_boiler/helpers/rake/debug'
+      autoload :Release, 'poise_boiler/helpers/rake/release'
       autoload :Travis, 'poise_boiler/helpers/rake/travis'
 
       # Install all rake tasks.
@@ -36,6 +40,10 @@ module PoiseBoiler
       def install
         Core.install(gem_name: gem_name, base: base, **options)
         Badges.install(gem_name: gem_name, base: base, **options)
+        Bump.install(gem_name: gem_name, base: base, **options)
+        Check.install(gem_name: gem_name, base: base, **options)
+        Debug.install(gem_name: gem_name, base: base, **options)
+        Release.install(gem_name: gem_name, base: base, **options)
         Travis.install(gem_name: gem_name, base: base, **options)
       end
     end

data/lib/poise_boiler/helpers/spec_helper.rb

@@ -72,6 +72,10 @@ module PoiseBoiler
             config.include Halite::SpecHelper(gem_name ? gemspec : nil)
             # Hide the spec helper from RSpec traces by default.
             config.backtrace_exclusion_patterns << %r{/halite/spec_helper}
+            # In verbose mode, set Chef to log level debug by default.
+            if ENV['DEBUG']
+              config.before { chefspec_options[:log_level] ||= :debug }
+            end
           end
         end
       end # /def install

data/lib/poise_boiler/kitchen.rb

@@ -15,7 +15,6 @@
 #
 
 require 'kitchen'
-require 'kitchen-sync'
 
 
 module PoiseBoiler
@@ -89,8 +88,8 @@ module PoiseBoiler
             # Run some installs at provision so they are cached in the image.
             # Install net-tools for netstat which is used by serverspec, and
             # iproute for ss (only used on EL7).
-            "test ! -f /etc/debian_version || apt-get install -y net-tools",
-            "test ! -f /etc/redhat-release || yum -y install net-tools iproute",
+            "test ! -f /etc/debian_version || apt-get install -y net-tools rsync",
+            "test ! -f /etc/redhat-release || yum -y install net-tools iproute rsync",
             # Make sure the hostname utilitiy is installed on CentOS 7. The
             # ||true is for EL6 which has no hostname package. Sigh.
             "test ! -f /etc/redhat-release || yum -y install hostname || true",
@@ -106,6 +105,14 @@ module PoiseBoiler
           'name' => 'sftp',
           'ssh_key' => docker_enabled ? File.expand_path('.kitchen/docker_id_rsa', root) : nil,
         },
+        'provisioner' => {
+          'attributes' => {
+            'POISE_DEBUG' => !!((ENV['POISE_DEBUG'] && ENV['POISE_DEBUG'] != 'false') ||
+                                (ENV['poise_debug'] && ENV['poise_debug'] != 'false') ||
+                                (ENV['DEBUG'] && ENV['DEBUG'] != 'false')
+                               ),
+          },
+        },
         'platforms' => expand_kitchen_platforms(platforms).map {|p| platform_definition(p) },
       }.to_yaml.gsub(/---[ \n]/, '')
     end

data/lib/poise_boiler/version.rb

@@ -16,5 +16,5 @@
 
 
 module PoiseBoiler
-  VERSION = '1.1.11'
+  VERSION = '1.2.0'
 end

data/poise-boiler.gemspec

@@ -37,13 +37,14 @@ Gem::Specification.new do |spec|
   # Development gems
   spec.add_dependency 'addressable', '~> 2.3'
   spec.add_dependency 'rake', '~> 10.4'
-  # spec.add_dependency 'travis', '~> 1.8'
+  spec.add_dependency 'travis', '~> 1.8', '>= 1.8.1'
   spec.add_dependency 'yard', '~> 0.8'
   spec.add_dependency 'yard-classmethods', '~> 1.0'
   spec.add_dependency 'halite', '~> 1.0' # This is a circular dependency
   spec.add_dependency 'mixlib-shellout', '>= 1.4', '< 3.0' # Chef 11 means shellout 1.4 :-(
-  spec.add_dependency 'pry' # Travis depends on old-ass pry, see https://github.com/travis-ci/travis.rb/issues/245
+  spec.add_dependency 'pry'
   spec.add_dependency 'pry-byebug'
+  spec.add_dependency 'git', '~> 1.2'
 
   # Test gems
   spec.add_dependency 'rspec', '~> 3.2'
@@ -58,7 +59,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'kitchen-vagrant'
   spec.add_dependency 'vagrant-wrapper'
   spec.add_dependency 'kitchen-docker'
-  spec.add_dependency 'kitchen-sync', '~> 1.1'
+  spec.add_dependency 'kitchen-sync', '~> 2.0'
   spec.add_dependency 'berkshelf', '~> 4.0'
 
   # Travis gems

data/spec/helpers/rake/bump_spec.rb

@@ -0,0 +1,100 @@
+#
+# Copyright 2015, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'spec_helper'
+
+describe PoiseBoiler::Helpers::Rake::Bump do
+  rakefile "require 'poise_boiler/helpers/rake/bump'\nPoiseBoiler::Helpers::Rake::Bump.install"
+  before { command('git init && git config user.email "you@example.com" && git config user.name "Your Name" && git add Rakefile && git commit -m "first commit" && git tag -a v2.3.4 -m "Release 2.3.4"') }
+  file 'lib/mygem/version.rb', <<-EOH
+module MyGem
+  VERSION = '1.0.0.pre'
+end
+EOH
+  def file_content
+    IO.read(File.join(temp_path, 'lib/mygem/version.rb'))
+  end
+
+  describe 'release:bump' do
+    rake_task 'release:bump'
+
+    it { is_expected.to eq "Bumping gem version from 1.0.0.pre to 2.3.5.pre\n" }
+    it { subject; expect(file_content).to eq <<-EOH }
+module MyGem
+  VERSION = '2.3.5.pre'
+end
+EOH
+  end # /describe release:bump
+
+  describe 'release:bump:minor' do
+    rake_task 'release:bump:minor'
+
+    it { is_expected.to eq "Bumping gem version from 1.0.0.pre to 2.4.0.pre\n" }
+    it { subject; expect(file_content).to eq <<-EOH }
+module MyGem
+  VERSION = '2.4.0.pre'
+end
+EOH
+  end # /describe release:bump:minor
+
+  describe 'release:bump:major' do
+    rake_task 'release:bump:major'
+
+    it { is_expected.to eq "Bumping gem version from 1.0.0.pre to 3.0.0.pre\n" }
+    it { subject; expect(file_content).to eq <<-EOH }
+module MyGem
+  VERSION = '3.0.0.pre'
+end
+EOH
+  end # /describe release:bump:major
+
+  describe '#bumped_version' do
+    let(:instance) { described_class.new(gem_name: 'test') }
+    let(:bump_type) { :patch }
+    let(:bump_release) { false }
+    let(:bump_current) { nil }
+    subject { instance.send(:bumped_version, type: bump_type, release: bump_release) }
+    before do
+      allow(instance).to receive(:latest_tag).and_return(bump_current)
+    end
+
+    context 'with no existing version' do
+      it { is_expected.to eq '1.0.0.pre' }
+    end # /context with no existing version
+
+    context 'with release mode' do
+      let(:bump_release) { true }
+      it { is_expected.to eq '1.0.0' }
+    end # /context with release mode
+
+    context 'with 1.2.3 and patch' do
+      let(:bump_current) { '1.2.3' }
+      it { is_expected.to eq '1.2.4.pre' }
+    end # /context with 1.2.3 and patch
+
+    context 'with 1.2.3 and minor' do
+      let(:bump_type) { :minor }
+      let(:bump_current) { '1.2.3' }
+      it { is_expected.to eq '1.3.0.pre' }
+    end # /context with 1.2.3 and minor
+
+    context 'with 1.2.3 and major' do
+      let(:bump_type) { :major }
+      let(:bump_current) { '1.2.3' }
+      it { is_expected.to eq '2.0.0.pre' }
+    end # /context with 1.2.3 and major
+  end # /describe #bumped_version
+end

data/spec/helpers/rake/check_spec.rb

@@ -0,0 +1,123 @@
+#
+# Copyright 2015, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'spec_helper'
+
+describe PoiseBoiler::Helpers::Rake::Check do
+  rakefile "require 'poise_boiler/helpers/rake/check'\nPoiseBoiler::Helpers::Rake::Check.install"
+  CHECK_INITIALIZER = 'git init && git config user.email "you@example.com" && git config user.name "Your Name" && git add main.rb Rakefile && git commit -m "first commit" && git tag -a v1.0.0 -m "Release 1.0.0" && git remote add origin http://example.com/ && git branch -f origin/master'
+
+  describe 'check' do
+    rake_task 'release:check'
+    file 'main.rb'
+    before { command(CHECK_INITIALIZER) }
+
+    context 'with no files' do
+      its(:stdout) { is_expected.to eq '' }
+    end # /context with no files
+
+    context 'with an uncommitted file' do
+      file 'other.rb'
+
+      its(:stdout) { is_expected.to eq "1 file with pending changes\nU other.rb\n" }
+    end # /context with an uncommitted file
+
+    context 'with a new file' do
+      file 'other.rb'
+      before { command('git add other.rb') }
+
+      its(:stdout) { is_expected.to eq "1 file with pending changes\nA other.rb\n" }
+    end # /context with a new file
+
+    context 'with a modified file' do
+      file 'main.rb', 'content'
+
+      its(:stdout) { is_expected.to eq "1 file with pending changes\nM main.rb\n" }
+    end # /context with a modified file
+
+    context 'with a deleted file' do
+      before { command('rm main.rb') }
+
+      its(:stdout) { is_expected.to eq "1 file with pending changes\nD main.rb\n" }
+    end # /context with a deleted file
+
+    context 'with multiple files' do
+      file 'main.rb', 'content'
+      file 'other.rb'
+
+      its(:stdout) { is_expected.to eq "2 files with pending changes\nM main.rb\nU other.rb\n" }
+    end # /context with multiple files
+
+    context 'with a new commit' do
+      file 'other.rb'
+      before { command('git add other.rb && git commit -m "second commit" && git branch -f origin/master') }
+
+      its(:stdout) { is_expected.to eq "1 commit since v1.0.0\n* second commit\n" }
+    end # /context with a new commit
+
+    context 'with an unpushed commit' do
+      file 'other.rb'
+      before { command('git add other.rb && git commit -m "second commit"') }
+
+      its(:stdout) { is_expected.to eq "1 commit (1 unpushed) since v1.0.0\n* second commit\n" }
+    end # /context with an unpushed commit
+
+    context 'with multiple commits' do
+      file 'other.rb'
+      file 'third.rb'
+      before { command('git add other.rb && git commit -m "second commit" && git add third.rb && git commit -m "moar commits" && git branch -f origin/master') }
+
+      its(:stdout) { is_expected.to eq "2 commits since v1.0.0\n* moar commits\n* second commit\n" }
+    end # /context with multiple commits
+
+    context 'with quiet mode' do
+      file 'other.rb'
+      file 'third.rb'
+      before { command('git add other.rb && git commit -m "second commit" && git add third.rb') }
+      environment QUIET: 1
+
+      its(:stdout) { is_expected.to eq "1 file with pending changes\n1 commit (1 unpushed) since v1.0.0\n" }
+    end # /context with quiet mode
+  end # /describe check
+
+  describe 'checkall' do
+    rake_task 'release:checkall'
+    file 'poise/Rakefile'
+    file 'poise/main.rb'
+    before { command(CHECK_INITIALIZER, cwd: File.join(temp_path, 'poise')) }
+    around do |ex|
+      begin
+        ENV['POISE_ROOT'] = temp_path
+        ex.run
+      ensure
+        ENV['POISE_ROOT'] = nil
+      end
+    end
+
+    context 'with one changed repo' do
+      file 'poise/other.rb'
+
+      its(:stdout) { is_expected.to eq "# poise\n1 file with pending changes\n" }
+    end # /context with one changed repo
+
+    context 'with verbose mode' do
+      file 'poise/other.rb'
+      environment VERBOSE: 1
+
+      its(:stdout) { is_expected.to eq "# poise\n1 file with pending changes\nU other.rb\n" }
+    end # /context with verbose mode
+  end # /describe checkall
+end

data/spec/{rakefile_spec.rb → helpers/rake_spec.rb}

@@ -17,7 +17,7 @@
 require 'spec_helper'
 
 describe 'poise_boiler/rake' do
-  file 'Rakefile', 'require "poise_boiler/rakefile"'
+  file 'Rakefile', 'require "poise_boiler/rake"'
   file 'test.gemspec', <<-EOH
 Gem::Specification.new do |spec|
   spec.name = 'test'
@@ -35,6 +35,11 @@ EOH
     its(:stdout) { is_expected.to include('rake release') }
     its(:stdout) { is_expected.to include('rake spec') }
     its(:stdout) { is_expected.to include('rake travis') }
+    its(:stdout) { is_expected.to include('rake debug') }
+    its(:stdout) { is_expected.to include('rake quiet') }
+    its(:stdout) { is_expected.to include('rake verbose') }
+    its(:stdout) { is_expected.to include('rake release:check') }
+    its(:stdout) { is_expected.to include('rake release:checkall') }
   end # /describe list of tasks
 
   describe 'specs in spec/' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: poise-boiler
 version: !ruby/object:Gem::Version
-  version: 1.1.11
+  version: 1.2.0
 platform: ruby
 authors:
 - Noah Kantrowitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-26 00:00:00.000000000 Z
+date: 2016-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -38,6 +38,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.4'
+- !ruby/object:Gem::Dependency
+  name: travis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.8.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.8.1
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -128,6 +148,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: git
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -274,14 +308,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: berkshelf
   requirement: !ruby/object:Gem::Requirement
@@ -366,7 +400,11 @@ files:
 - lib/poise_boiler/helpers.rb
 - lib/poise_boiler/helpers/rake.rb
 - lib/poise_boiler/helpers/rake/badges.rb
+- lib/poise_boiler/helpers/rake/bump.rb
+- lib/poise_boiler/helpers/rake/check.rb
 - lib/poise_boiler/helpers/rake/core.rb
+- lib/poise_boiler/helpers/rake/debug.rb
+- lib/poise_boiler/helpers/rake/release.rb
 - lib/poise_boiler/helpers/rake/travis.rb
 - lib/poise_boiler/helpers/spec_helper.rb
 - lib/poise_boiler/kitchen.rb
@@ -376,12 +414,14 @@ files:
 - lib/poise_boiler/spec_helper.rb
 - lib/poise_boiler/version.rb
 - poise-boiler.gemspec
-- spec/helpers/badge_spec.rb
-- spec/helpers/travis_spec.rb
+- spec/helpers/rake/badge_spec.rb
+- spec/helpers/rake/bump_spec.rb
+- spec/helpers/rake/check_spec.rb
+- spec/helpers/rake/travis_spec.rb
+- spec/helpers/rake_spec.rb
+- spec/helpers/spec_helper_spec.rb
 - spec/kitchen_spec.rb
-- spec/rakefile_spec.rb
 - spec/spec_helper.rb
-- spec/spec_helper_spec.rb
 homepage: https://github.com/poise/poise-boiler
 licenses:
 - Apache 2.0
@@ -408,10 +448,12 @@ signing_key:
 specification_version: 4
 summary: Boilerplate-reduction helpers for Poise/Halite-style gemss.
 test_files:
-- spec/helpers/badge_spec.rb
-- spec/helpers/travis_spec.rb
+- spec/helpers/rake/badge_spec.rb
+- spec/helpers/rake/bump_spec.rb
+- spec/helpers/rake/check_spec.rb
+- spec/helpers/rake/travis_spec.rb
+- spec/helpers/rake_spec.rb
+- spec/helpers/spec_helper_spec.rb
 - spec/kitchen_spec.rb
-- spec/rakefile_spec.rb
 - spec/spec_helper.rb
-- spec/spec_helper_spec.rb
 has_rdoc: