rake-n-bake 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e848e6763983f8635b52f18a27ac1865f4f98819
-  data.tar.gz: fbdbb9122b16d1565ff43b02463c8ba437902d0b
+  metadata.gz: 48b193c4dd6c74aeddec374e3d7d4ca441cc8ea5
+  data.tar.gz: 0d504fc8b732db739a32392d3df497ef1bc4e364
 SHA512:
-  metadata.gz: 23ef3dd8ef40ad016cfb6690b314e717bdacaec33003736e0aff2da0dfff49f6c7d77bf51ed53c4020c641cf041e6aa3e6414c8569c46685b8b3936aba0b27f0
-  data.tar.gz: de4442cd527e2baa46e2aa7f27628c7e2fb7ff70e9c011fa880b26f78214d4344849d989bb704db7172581ce359ec2bf793e7afb5166945fac33731803a90881
+  metadata.gz: d48ae9d2f14f58703471ce23c6c229612c0d1d96dee0eb5c72b4f21647811a41704eb4b34c3e575644ae08190f92e921ad11bf2d80a9d48e85379c5ff8f971bc
+  data.tar.gz: 9a51d706fafd3ab1a9b4e0cb2eeff67aa1b8051b926b1d383d992f51d913e4d4120c5f997a6196c0c929c834e8a12749f2efbece2dc509c7520a505c800d412a

data/.semver

@@ -1,6 +1,6 @@
 ---
 :major: 1
 :minor: 4
-:patch: 1
+:patch: 2
 :special: ''
 :metadata: ''

data/README.md

@@ -130,7 +130,7 @@ Runs [Traceroute](https://rubygems.org/gems/traceroute), a tool for finding unus
 
 Handy Tips for new tasks
 ------------------------
-- All tasks loaded by `lib/rake_n_bake.rb` will have access to the `RakeNBake::AssistantBaker`. This is intended for truely common things, like logging out when a particular step runs or passes.
+- All tasks loaded by `lib/rake_n_bake.rb` will have access to the `RakeNBake::Baker`. This is intended for truely common things, like logging out when a particular step runs or passes.
 
 Contributing
 ------------

data/history.rdoc

@@ -1,3 +1,5 @@
+== v1.4.2 (12 October 2016)
+
 == v1.4.1 (08 September 2016)
 
 * Update Rake dependency

data/lib/{assistant_baker.rb → baker.rb}

@@ -2,7 +2,7 @@
 require 'term/ansicolor'
 
 module RakeNBake
-  class AssistantBaker
+  class Baker
     def self.log_step message
       puts Term::ANSIColor.blue +
         Term::ANSIColor.underline +

data/lib/rake-n-bake.rb

@@ -1,7 +1,7 @@
 $:.unshift File.dirname(__FILE__)
 
 require 'rake'
-require_relative 'assistant_baker'
+require_relative 'baker'
 
 dir = File.expand_path("../tasks", File.dirname(__FILE__))
 Dir.glob("#{dir}/*.rake").each { |r| import r}

data/lib/semver_versioning.rb

@@ -1,4 +1,5 @@
 require 'semver'
+
 module RakeNBake
   class SemverVersioning
     def self.current_version
@@ -61,12 +62,16 @@ module RakeNBake
     end
 
     def self.update_version_rb
-      return unless File.exists?('lib/version.rb')
+      version_files = Dir.glob('lib{,/*}/version.rb').uniq
+      return unless version_files.size == 1
+      version_file = version_files[0]
+
       version = current_version.to_s.sub(/^v/,'')
       version_string = "VERSION = '#{version}'"
-      version_file_content = File.read('lib/version.rb').sub(/VERSION = .*$/, version_string)
-      File.write('lib/version.rb', version_file_content)
-      `git add lib/version.rb`
+      version_file_content = File.read(version_file).sub(/VERSION = .*$/, version_string)
+
+      File.write(version_file, version_file_content)
+      `git add #{version_file}`
     end
 
     def self.tag
@@ -86,4 +91,3 @@ module RakeNBake
     end
   end
 end
-

data/lib/version.rb

@@ -1,3 +1,3 @@
 module RakeNBake
-  VERSION = '1.4.1'
+  VERSION = '1.4.2'
 end

data/spec/{assistant_baker_spec.rb → baker_spec.rb}

@@ -2,7 +2,7 @@
 require 'spec_helper'
 require production_code
 
-describe RakeNBake::AssistantBaker do
+describe RakeNBake::Baker do
   describe '#log_step' do
     it 'puts the given message' do
       expect{described_class.log_step 'Foo'}.to output(/Foo/).to_stdout

data/spec/semver_versioning_spec.rb

@@ -134,32 +134,75 @@ describe RakeNBake::SemverVersioning do
   describe '#update_version_rb' do
     before { File.write(project_root_file('.semver'), YAML.dump(version)) }
 
-    around do |example|
-      FileUtils.cp 'lib/version.rb', 'lib/version.rb.orig'
-      example.run
-      FileUtils.mv 'lib/version.rb.orig', 'lib/version.rb'
-      `git reset lib/version.rb`
-    end
+    context 'when version.rb is in the top of the lib directory' do
+      around do |example|
+        FileUtils.cp 'lib/version.rb', 'lib/version.rb.orig'
+        example.run
+        FileUtils.mv 'lib/version.rb.orig', 'lib/version.rb'
+        `git reset lib/version.rb`
+      end
 
-    it 'writes the version into lib/version.rb' do
-      expect{ described_class.update_version_rb }
-        .to change{ File.read('lib/version.rb').include? "VERSION = '1.2.3'" }
-        .from(false)
-        .to(true)
-    end
+      it 'writes the version into lib/version.rb' do
+        expect{ described_class.update_version_rb }
+          .to change{ File.read('lib/version.rb').include? "VERSION = '1.2.3'" }
+          .from(false)
+          .to(true)
+      end
+
+      it 'does nothing if lib/version.rb does not exist' do
+        FileUtils.rm 'lib/version.rb'
+        expect{ described_class.update_version_rb }
+          .to_not change{ File.exists? 'lib/version.rb' }
+          .from(false)
+      end
 
-    it 'does nothing if lib/version.rb does not exist' do
-      FileUtils.rm 'lib/version.rb'
-      expect{ described_class.update_version_rb }
-        .to_not change{ File.exists? 'lib/version.rb' }
-        .from(false)
+      it 'stages to change lib/version.rb to git' do
+        expect{ described_class.update_version_rb }
+          .to change{ `git status`.include? 'lib/version.rb' }
+          .from(false)
+          .to(true)
+      end
     end
 
-    it 'stages to change lib/version.rb to git' do
-      expect{ described_class.update_version_rb }
-        .to change{ `git status`.include? 'lib/version.rb' }
-        .from(false)
-        .to(true)
+    context 'when version.rb is inside the gem directory in lib' do
+      around do |example|
+        FileUtils.mkdir 'lib/gemname/'
+        FileUtils.cp 'lib/version.rb', 'lib/gemname/version.rb'
+        FileUtils.mv 'lib/version.rb', 'lib/version.rb.orig'
+        example.run
+        FileUtils.rm_rf 'lib/gemname'
+        FileUtils.mv 'lib/version.rb.orig', 'lib/version.rb'
+        `git reset lib/version.rb`
+        `git rm lib/gemname/version.rb &>/dev/null`
+      end
+
+      it 'writes the version into lib/gemname/version.rb' do
+        expect{ described_class.update_version_rb }
+          .to change{ File.read('lib/gemname/version.rb').include? "VERSION = '1.2.3'" }
+          .from(false)
+          .to(true)
+      end
+
+      it 'does nothing if lib/gemname/version.rb does not exist' do
+        FileUtils.rm 'lib/gemname/version.rb'
+        expect{ described_class.update_version_rb }
+          .to_not change{ File.exists? 'lib/gemname/version.rb' }
+          .from(false)
+      end
+
+      it 'stages changes to lib/gemname/version.rb to git' do
+        expect{ described_class.update_version_rb }
+          .to change{ `git status`.include? 'lib/gemname/version.rb' }
+          .from(false)
+          .to(true)
+      end
+
+      it 'does nothing if there are multiple version.rb files found' do
+        FileUtils.cp 'lib/version.rb.orig', 'lib/version.rb'
+        described_class.update_version_rb
+        expect(`git status`).to_not match /version.rb/
+      end
+
     end
   end
 

data/tasks/brakeman.rake

@@ -5,7 +5,7 @@ begin
 
     desc "Run Brakeman"
     task :brakeman, :output_files do |t, args|
-      RakeNBake::AssistantBaker.log_step 'Running Brakeman'
+      RakeNBake::Baker.log_step 'Running Brakeman'
 
       files = args[:output_files].split(' ') if args[:output_files]
       Brakeman.run :app_path => ".", :output_files => files, :print_report => true
@@ -19,7 +19,7 @@ rescue LoadError
     tasks.map(&:to_sym).each do |t|
       desc 'brakeman is not available (gem not installed)'
       task t do
-        RakeNBake::AssistantBaker.log_missing_gem 'brakeman'
+        RakeNBake::Baker.log_missing_gem 'brakeman'
         abort
       end
     end

data/tasks/bundle-audit.rake

@@ -4,10 +4,10 @@ begin
   namespace :bake do
     desc 'Check Gemfile.lock for security issues'
     task :'bundle-audit' do
-      RakeNBake::AssistantBaker.log_step 'Updating DB of security advisories'
+      RakeNBake::Baker.log_step 'Updating DB of security advisories'
       system('bundle exec bundle-audit update')
 
-      RakeNBake::AssistantBaker.log_step 'Checking gems for known security warnings'
+      RakeNBake::Baker.log_step 'Checking gems for known security warnings'
       exit 1 unless system('bundle exec bundle-audit check')
     end
   end
@@ -20,7 +20,7 @@ rescue LoadError
     tasks.each do |t|
       desc "This task is not available"
       task t do
-        RakeNBake::AssistantBaker.log_missing_gem 'bundler-audit'
+        RakeNBake::Baker.log_missing_gem 'bundler-audit'
         abort
       end
     end

data/tasks/check_external_deps.rake

@@ -4,7 +4,7 @@ namespace :bake do
   task :check_external_dependencies do
     checker = RakeNBake::DependencyChecker.new(@external_dependencies)
 
-    RakeNBake::AssistantBaker.log_step 'Checking external dependencies'
+    RakeNBake::Baker.log_step 'Checking external dependencies'
     checker.check
     puts
 

data/tasks/coverage.rake

@@ -6,7 +6,7 @@ begin
     if File.exists?(report)
       SimpleCov.coverage_dir coverage_dir
     else
-      RakeNBake::AssistantBaker.log_warn "SimpleCov report could not be found at #{report}"
+      RakeNBake::Baker.log_warn "SimpleCov report could not be found at #{report}"
       fail
     end
   end
@@ -14,9 +14,9 @@ begin
   def check_coverage_level_above level
     coverage = SimpleCov.result.covered_percent
     if coverage >= level
-      RakeNBake::AssistantBaker.log_passed "Feature coverage is at #{coverage}%"
+      RakeNBake::Baker.log_passed "Feature coverage is at #{coverage}%"
     else
-      RakeNBake::AssistantBaker.log_warn "Spec coverage was only #{coverage}%"
+      RakeNBake::Baker.log_warn "Spec coverage was only #{coverage}%"
       fail
     end
   end
@@ -27,7 +27,7 @@ begin
 
       desc 'Check coverage from RSpec'
       task :check_specs do
-        RakeNBake::AssistantBaker.log_step 'Checking spec coverage'
+        RakeNBake::Baker.log_step 'Checking spec coverage'
         coverage_dir = 'log/coverage/spec'
         set_coverage_dir(coverage_dir)
         check_coverage_level_above COVERAGE_PERCENT
@@ -35,7 +35,7 @@ begin
 
       desc 'Check coverage from Cucumber'
       task :check_cucumber do
-        RakeNBake::AssistantBaker.log_step 'Checking feature coverage'
+        RakeNBake::Baker.log_step 'Checking feature coverage'
         coverage_dir = 'log/coverage/features'
         set_coverage_dir(coverage_dir)
         check_coverage_level_above COVERAGE_PERCENT
@@ -50,7 +50,7 @@ rescue LoadError
       %w[check_specs check_cucumber].map(&:to_sym).each do |t|
         desc 'SimpleCov rake tasks are not available (gem not installed)'
         task t do
-          RakeNBake::AssistantBaker.log_missing_gem 'simplecov', 'SimpleCov'
+          RakeNBake::Baker.log_missing_gem 'simplecov', 'SimpleCov'
           abort
         end
       end

data/tasks/fasterer.rake

@@ -3,7 +3,7 @@ begin
 
   namespace :bake do
     task :fasterer do
-      RakeNBake::AssistantBaker.log_step 'Running Fasterer'
+      RakeNBake::Baker.log_step 'Running Fasterer'
       system('fasterer')
     end
   end
@@ -15,7 +15,7 @@ rescue LoadError
     tasks.map(&:to_sym).each do |t|
       desc 'fasterer is not available (gem not installed)'
       task t do
-        RakeNBake::AssistantBaker.log_missing_gem 'fasterer'
+        RakeNBake::Baker.log_missing_gem 'fasterer'
         abort
       end
     end

data/tasks/metric_fu.rake

@@ -7,7 +7,7 @@ rescue LoadError
     %w[all cane churn flay flog hotspots only reek roodi saikuro stats].map(&:to_sym).each do |t|
       desc 'metric_fu rake tasks are not available (gem not installed)'
       task t do
-        RakeNBake::AssistantBaker.log_missing_gem 'metric_fu'
+        RakeNBake::Baker.log_missing_gem 'metric_fu'
         abort
       end
     end

data/tasks/rails_best_practices.rake

@@ -4,7 +4,7 @@ begin
   namespace :bake do
     desc 'a code metric tool to check the quality of rails code'
     task :rails_best_practices do
-      RakeNBake::AssistantBaker.log_step 'Running Rails best practices'
+      RakeNBake::Baker.log_step 'Running Rails best practices'
       fail unless system('bundle exec rails_best_practices')
     end
   end
@@ -13,7 +13,7 @@ rescue LoadError
   namespace :bake do
     desc 'rails best practices is not available (gem not installed)'
     task :rails_best_practices do
-      RakeNBake::AssistantBaker.log_missing_gem 'rails_best_practices'
+      RakeNBake::Baker.log_missing_gem 'rails_best_practices'
       abort
     end
   end

data/tasks/rspec.rake

@@ -3,7 +3,7 @@ begin
 
   RSpec::Core::RakeTask.new(:"bake:rspec") do |t|
     t.verbose = false
-    RakeNBake::AssistantBaker.log_step 'Running specs'
+    RakeNBake::Baker.log_step 'Running specs'
   end
 
   RSPEC_SUBDIRS = %w[integration features requests]
@@ -12,7 +12,7 @@ begin
     RSpec::Core::RakeTask.new(:"bake:rspec:#{subdir}") do |t|
       t.verbose = false
       t.pattern = "spec/#{subdir}/**/*_spec.rb"
-      RakeNBake::AssistantBaker.log_step "Running #{subdir} specs"
+      RakeNBake::Baker.log_step "Running #{subdir} specs"
     end
   end
 
@@ -23,13 +23,13 @@ begin
       file_list = file_list.exclude "spec/#{subdir}/**/*_spec.rb"
     end
     t.pattern = file_list
-    RakeNBake::AssistantBaker.log_step 'Running unit specs'
+    RakeNBake::Baker.log_step 'Running unit specs'
   end
 
   RSpec::Core::RakeTask.new(:"bake:rspec:tag", :tag) do |t, task_args|
     t.verbose = false
     t.rspec_opts = "--tag #{task_args[:tag]}"
-    RakeNBake::AssistantBaker.log_step "Running specs tagged #{task_args[:tag]}"
+    RakeNBake::Baker.log_step "Running specs tagged #{task_args[:tag]}"
   end
 
   RSpec::Core::RakeTask.new(:"bake:rspec_test_prepare" => :"test:prepare") do |t|
@@ -42,7 +42,7 @@ rescue LoadError
     %w[rspec rspec_test_prepare].map(&:to_sym).each do |t|
       desc 'RSpec rake tasks are not available (gem not installed)'
       task t do
-        RakeNBake::AssistantBaker.log_missing_gem 'rspec', 'RSpec'
+        RakeNBake::Baker.log_missing_gem 'rspec', 'RSpec'
         abort
       end
     end

data/tasks/rubocop.rake

@@ -13,7 +13,7 @@ rescue LoadError
     tasks.map(&:to_sym).each do |t|
       desc 'rubocop is not available (gem not installed)'
       task t do
-        RakeNBake::AssistantBaker.log_missing_gem 'rubocop'
+        RakeNBake::Baker.log_missing_gem 'rubocop'
         abort
       end
     end

data/tasks/ruby_critic.rake

@@ -3,7 +3,7 @@ begin
 
   namespace :bake do
     task :rubycritic do
-      RakeNBake::AssistantBaker.log_step 'Running rubycritic'
+      RakeNBake::Baker.log_step 'Running rubycritic'
       system('rubycritic')
     end
   end
@@ -15,7 +15,7 @@ rescue LoadError
     tasks.map(&:to_sym).each do |t|
       desc 'rubycritic is not available (gem not installed)'
       task t do
-        RakeNBake::AssistantBaker.log_missing_gem 'rubycritic'
+        RakeNBake::Baker.log_missing_gem 'rubycritic'
         abort
       end
     end

data/tasks/semver.rake

@@ -1,6 +1,5 @@
 begin
   require_relative '../lib/semver_versioning'
-  require_relative '../lib/assistant_baker'
 
   namespace :bake do
     namespace :semver do
@@ -62,7 +61,7 @@ rescue LoadError
       tasks.each do |t|
         desc 'SemVer rake tasks are not available (gem not installed)'
         task t do
-          RakeNBake::AssistantBaker.log_missing_gem 'semver2'
+          RakeNBake::Baker.log_missing_gem 'semver2'
           abort
         end
       end

data/tasks/traceroute.rake

@@ -13,7 +13,7 @@ if defined? Rails
       tasks.map(&:to_sym).each do |t|
         desc 'Traceroute is not available (gem not installed)'
         task t do
-          RakeNBake::AssistantBaker.log_missing_gem 'traceroute'
+          RakeNBake::Baker.log_missing_gem 'traceroute'
           abort
         end
       end
@@ -26,7 +26,7 @@ else
     tasks.map(&:to_sym).each do |t|
       desc 'Traceroute is not available Rails is required'
       task t do
-        RakeNBake::AssistantBaker.log_warn 'Traceroute requires rails'
+        RakeNBake::Baker.log_warn 'Traceroute requires rails'
         abort
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rake-n-bake
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Richard Vickerstaff
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-08 00:00:00.000000000 Z
+date: 2016-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -76,7 +76,7 @@ files:
 - bin/term_mandel
 - bin/thor
 - history.rdoc
-- lib/assistant_baker.rb
+- lib/baker.rb
 - lib/dependency_checker.rb
 - lib/rake-n-bake.rb
 - lib/rake_n_bake.rb
@@ -84,7 +84,7 @@ files:
 - lib/version.rb
 - rake-n-bake.gemspec
 - spec/.keep
-- spec/assistant_baker_spec.rb
+- spec/baker_spec.rb
 - spec/dependency_checker_spec.rb
 - spec/semver_versioning_spec.rb
 - spec/spec_helper.rb