rake-n-bake 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a818eee7cb0bf7959752aa34683da02ea1a8d82e
-  data.tar.gz: fec60f1e1a9fdecbf4f1a657c76f4d280057432e
+  metadata.gz: 6c9a3152547c691ab0f75c2c26707b0b5b15d0a9
+  data.tar.gz: 23210b8c106d329f40ba501d9caab2af13f641e9
 SHA512:
-  metadata.gz: 86c98341c780bc85870bf552356fbe7075cf07bbaa133168e05ef324b1e271311d0d799d127d3a61073db24fa2f67483e5c5305b612262e8d14f67826754ab8a
-  data.tar.gz: 832f93811f23e84728f724cce3f5059f84d62e316472534259cb7b920f95465d646e99b33c2dca23b2c830a9d07c4de5f05f7516d706ee55c6415f2fac41da71
+  metadata.gz: e41f8ba588ef6461ee6c3256767c920a5d762389cc7bd5c18539624c2e0569c8ea68b1c38a0ae2c3586b07227a45658284a3a77017731f3eae87e162937239a3
+  data.tar.gz: 0adf454e7efed8c30b9edbc90938aaf832f1a984d8213ca1b9f5482a25d634446d45e681a1ae044e3ba30d7f484b093b7c8d21cd6acea67f6a83c8524f9550c0

data/Gemfile

@@ -3,11 +3,12 @@ source 'https://rubygems.org'
 gemspec
 
 group :development, :test do
-  gem 'semver2'
+  gem 'bundler-audit'
+  gem 'cucumber'
   gem 'rake'
   gem 'rspec'
-  gem 'bundler-audit'
+  gem 'semver2'
   gem 'simplecov'
-  gem 'timecop'
   gem 'term-ansicolor', '~> 1.3'
+  gem 'timecop'
 end

data/history.rdoc

@@ -1,3 +1,7 @@
+== 1.0.6 (23 October 2014)
+
+* SemVer now patches CHANGELOG.md as well as history.rdoc
+
 == 1.0.5 (21 October 2014)
 
 * Fix semver tasks to write to the correct file

data/lib/semver_versioning.rb

@@ -52,16 +52,18 @@ module RakeNBake
     end
 
     def self.update_history_file
-      history_file = 'history.rdoc'
-      if File.exist? history_file
-        current_history = File.read history_file
-        File.open history_file, 'w' do |f|
-          f.puts "== #{current_version} (#{Time.now.strftime "%d %B %Y"})"
-          f.puts
-          f.print current_history
+      supported_history_files = %w[ history.rdoc CHANGELOG.md ]
+      supported_history_files
+        .select {|histf| File.exist? histf}
+        .map do |histf|
+          current_history = File.read histf
+          File.open histf, 'w' do |f|
+            f.puts "== #{current_version} (#{Time.now.strftime "%d %B %Y"})"
+            f.puts
+            f.print current_history
+          end
+          `git add #{histf}`
         end
-        `git add history.rdoc`
-      end
     end
 
     def self.tag

data/rake-n-bake.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "rake-n-bake"
-  spec.version       = '1.0.5'
+  spec.version       = '1.0.6'
   spec.authors       = ["Richard Vickerstaff", "Adam Whittingham"]
   spec.email         = ["m3akq@btinternet.com", "adam.whittingham@gmail.com"]
   spec.description   = "Common rake tasks, baked to perfection and ready to serve!"

data/spec/semver_versioning_spec.rb

@@ -122,20 +122,39 @@ describe RakeNBake::SemverVersioning do
       it 'does nothing' do
         described_class.update_history_file
         expect(File.exist? '../history.rdoc').to eq false
+        expect(File.exist? '../CHANGELOG.md').to eq false
       end
     end
-    context 'when there is a history file' do
+
+    context 'when there is a history.rdoc file' do
       before do
         File.write(File.join(File.dirname(__FILE__), '../.semver'), YAML.dump(version))
         File.write(File.join(File.dirname(__FILE__), '../history.rdoc'), '* Some changes')
       end
 
+      after { File.unlink(File.join(File.dirname(__FILE__), '../history.rdoc')) }
+
       it 'Adds the version number and date to the top of the file and adds it to git' do
         expect(Object).to receive(:`).with('git add history.rdoc')
         described_class.update_history_file
         expect(File.read(File.join(File.dirname(__FILE__), '../history.rdoc')).lines.first).to eq "== v1.2.3 (#{Time.now.strftime "%d %B %Y"})\n"
       end
     end
+
+    context 'when there is a CHANGELOG.md file' do
+      before do
+        File.write(File.join(File.dirname(__FILE__), '../.semver'), YAML.dump(version))
+        File.write(File.join(File.dirname(__FILE__), '../CHANGELOG.md'), '* Some changes')
+      end
+
+      after { File.unlink(File.join(File.dirname(__FILE__), '../CHANGELOG.md')) }
+
+      it 'Adds the version number and date to the top of the file and adds it to git' do
+        expect(Object).to receive(:`).with('git add CHANGELOG.md')
+        described_class.update_history_file
+        expect(File.read(File.join(File.dirname(__FILE__), '../CHANGELOG.md')).lines.first).to eq "== v1.2.3 (#{Time.now.strftime "%d %B %Y"})\n"
+      end
+    end
   end
 
   describe 'tag' do

data/tasks/bundler_audit.rake

@@ -7,6 +7,19 @@ begin
       Bundler::Audit::CLI.start
     end
   end
+
 rescue LoadError
-  $stderr.puts 'Warning: bundler audit gem not available.'
+
+  tasks = %w[bundler_audit].map(&:to_sym)
+
+  namespace :bake do
+    tasks.each do |t|
+      desc "This task is not available"
+      task t do
+        $stderr.puts "This task is not available because '#{missing}' is not available."
+        $stderr.puts "Try adding \"gem 'bundler-audit'\" to your Gemfile or run `gem install bundler-audit` and try again."
+        abort
+      end
+    end
+  end
 end

data/tasks/coverage.rake

@@ -17,5 +17,18 @@ begin
     end
   end
 rescue LoadError
-  $stderr.puts 'Warning: SimpleCov not available.'
+
+  namespace :bake do
+    namespace :coverage do
+      %w[check_specs check_cucumber].map(&:to_sym).each do |t|
+        desc 'SimpleCov rake tasks are not available (gem not installed)'
+        task t do
+          $stdout.puts "This task is not available because the SimpleCov gem is not installed."
+          $stderr.puts "Try adding \"gem 'simplecov'\" to your Gemfile or run `gem install simplecov` and try again."
+          abort
+        end
+      end
+    end
+  end
+
 end

data/tasks/rspec.rake

@@ -8,6 +8,18 @@ begin
   RSpec::Core::RakeTask.new(:"bake:rspec_test_prepare" => :"test:prepare") do |t|
     t.verbose = false
   end
+
 rescue LoadError
-  $stderr.puts 'Warning: RSpec not available.'
+
+  namespace :bake do
+    %w[rspec rspec_test_prepare].map(&:to_sym).each do |t|
+      desc 'RSpec rake tasks are not available (gem not installed)'
+      task t do
+        $stdout.puts "This task is not available because the RSpec gem is not installed."
+        $stderr.puts "Try adding \"gem 'rspec'\" to your Gemfile or run `gem install rspec` and try again."
+        abort
+      end
+    end
+  end
+
 end

data/tasks/semver.rake

@@ -53,6 +53,22 @@ begin
       end
     end
   end
+
 rescue LoadError
-  $stderr.puts "Warning: Semver not avaialble"
+
+  tasks = %w[version major minor patch prerelease inc_prerelease release].map(&:to_sym)
+
+  namespace :bake do
+    namespace :semver do
+      tasks.each do |t|
+        desc 'SemVer rake tasks are not available (gem not installed)'
+        task t do
+          $stdout.puts "This task is not available because the SemVer2 gem is not installed."
+          $stderr.puts "Try adding \"gem 'semver2'\" to your Gemfile or run `gem semver2 rspec` and try again."
+          abort
+        end
+      end
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rake-n-bake
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Richard Vickerstaff
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-21 00:00:00.000000000 Z
+date: 2014-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake