rake_rack 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff8047370f891de9c32be54447543424552d5786
-  data.tar.gz: fdeb3e724a981c0d8662530099ac95d81988624c
+  metadata.gz: 9f3ce1fb58a6142ef4ee8b5dbb63b56ecca4651e
+  data.tar.gz: 2d02f6292f670be585aa6c28c57a27fef7e79b4a
 SHA512:
-  metadata.gz: 6ceebe5d1beffc811f501718a86abee90225dab5ac1ebe699129ba81d8efbcf317b4b2d66d83fa7efb6327783e8c833cb061827a32957e15415e530c4ffb1bb5
-  data.tar.gz: c5d875c4cfa941796dfce5aef8d3104bb9c4ee4c0e0ccd085058e33924cb5fb17c47a596be0385525b8ab2233b4d046b1cad7fcf81ee1707b4c1221cf686eaff
+  metadata.gz: 3457e22c01719b5616fa2f36211d80bc09194bb5ad94e0405d08665afd48ef2b365edb734ffaaedf65543bc095a39eb48a66e489ac54670e7bf465daba81c28e
+  data.tar.gz: 5cc284136eed4066da4c2f1cc9be874c24719fd397d8c04c7a1a2e323b0d2cdcb2785be7940aed30859c242da0ae2e5a6b062f5be915c844c488100a714b72c7

data/.gitignore

@@ -1,2 +1,3 @@
+/log/*
 *.gem
 *.sw?

data/.travis.yml

@@ -13,3 +13,4 @@ deploy:
   gem: rake_rack
   on:
     tags: true
+    all_branches: true

data/Gemfile

@@ -2,3 +2,6 @@ source 'https://rubygems.org'
 
 gem 'rspec'
 gem 'rake'
+gem 'pry-byebug'
+gem 'simplecov'
+gem 'timecop'

data/Gemfile.lock

@@ -1,7 +1,23 @@
 GEM
   remote: https://rubygems.org/
   specs:
+    byebug (2.7.0)
+      columnize (~> 0.3)
+      debugger-linecache (~> 1.2)
+    coderay (1.1.0)
+    columnize (0.8.9)
+    debugger-linecache (1.2.0)
     diff-lcs (1.2.5)
+    docile (1.1.5)
+    method_source (0.8.2)
+    multi_json (1.10.1)
+    pry (0.10.0)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    pry-byebug (1.3.3)
+      byebug (~> 2.7)
+      pry (~> 0.10)
     rake (10.1.0)
     rspec (3.0.0)
       rspec-core (~> 3.0.0)
@@ -15,10 +31,20 @@ GEM
     rspec-mocks (3.0.2)
       rspec-support (~> 3.0.0)
     rspec-support (3.0.2)
+    simplecov (0.8.2)
+      docile (~> 1.1.0)
+      multi_json
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
+    slop (3.5.0)
+    timecop (0.7.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  pry-byebug
   rake
   rspec
+  simplecov
+  timecop

data/Rakefile

@@ -2,6 +2,7 @@ require './lib/rake_rack'
 
 task :default => [
   :"rake_rack:rspec",
+  :"rake_rack:coverage:check_specs",
   :"rake_rack:ok",
 ]
 

data/history.rdoc

@@ -1,3 +1,8 @@
+== 0.0.6 (17 July 2014)
+
+* Extract version logic into a class
+* Allow all tags to push to RubyGems
+
 == 0.0.5 (16 July 2014)
 
 * Change version tack so it can update gem version

data/lib/rake_rack.rb

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

data/lib/version.rb

@@ -0,0 +1,59 @@
+class RakeRack
+  class Version
+    HISTORY_FILE = "history.rdoc"
+    def self.current_history history_file
+      File.read history_file
+    end
+
+    def self.latest_version
+      latest_version_string = current_history(HISTORY_FILE)[/== ([\d\.]*)/, 1] || "0.0.0"
+      @latest_version ||= latest_version_string.split(".").map(&:to_i)
+      def @latest_version.to_s
+        join "."
+      end
+      @latest_version
+    end
+
+    def self.update_to version
+      add_history_header version
+      update_gem version if gem?
+      commit version
+      tag version
+      branch = `git symbolic-ref HEAD`[%r{.*/(.*)}, 1]
+      puts "To push the new tag, use 'git push origin #{branch} --tags'"
+    end
+
+    def self.add_history_header(version, history_file = HISTORY_FILE)
+      history = current_history history_file
+      File.open history_file, "w" do |f|
+        f.puts "== #{version} (#{Time.now.strftime "%d %B %Y"})"
+        f.puts
+        f.print history
+      end
+      puts "Added version to history.rdoc"
+    end
+
+    def self.update_gem version
+      path = Dir.glob('*.gemspec').first
+      text = File.read path
+      File.open(path, "w") do |file|
+        file.puts text.sub(/(.*version\s*=\s*)(['|"].*['|"])/, "\\1'#{version}'")
+      end
+      puts "Added version to .gemfile"
+    end
+
+    def self.commit version
+      `git add . && git commit -m 'increment version to #{version}'`
+      puts "Committed change"
+    end
+
+    def self.tag version
+      `git tag #{version}`
+      puts "Tagged with #{version}"
+    end
+
+    def self.gem?
+      !Dir.glob('*.gemspec').empty?
+    end
+  end
+end

data/rake_rack.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "rake_rack"
-  spec.version       = '0.0.5'
+  spec.version       = '0.0.6'
   spec.authors       = ["Richard Vickerstaff"]
   spec.email         = ["m3akq@btinternet.com"]
   spec.description   = "A set of rake tasks I commonly use - Formerly known as pool_net"

data/spec/spec_helper.rb

@@ -0,0 +1,10 @@
+require 'simplecov'
+require 'pry-byebug'
+require 'timecop'
+
+
+SimpleCov.start do
+  coverage_dir 'log/coverage/spec'
+end
+
+require_relative '../lib/rake_rack'

data/spec/version_spec.rb

@@ -0,0 +1,150 @@
+require 'spec_helper'
+
+describe RakeRack::Version do
+  before do
+    allow(described_class).to receive(:`)
+    allow(described_class).to receive(:puts)
+  end
+
+  describe '.current_history' do
+    before do
+      allow(File).to receive(:read).and_return 'history'
+    end
+
+    it 'returns the current history file' do
+      expect(described_class.current_history('./path')).to eq 'history'
+    end
+  end
+
+  describe '.latest_version' do
+    before do
+      allow(File).to receive(:read).and_return "== 1.2.3 (16 July 2014)\n * Change version tack so it can update gem version"
+    end
+
+    context 'there is no version'do
+      it 'returns a version of [0,0,0]' do
+        allow(File).to receive(:read).and_return ""
+        expect(described_class.latest_version).to eq [1,2,3]
+      end
+    end
+
+    context 'there is a version' do
+      it 'returns the latest version' do
+        expect(described_class.latest_version).to eq [1,2,3]
+      end
+    end
+
+    it 'defines the .to_s of the latest version'do
+      expect(described_class.latest_version.to_s).to eq "1.2.3"
+    end
+  end
+
+  describe '.gem?' do
+    context 'the project is a gem' do
+      before do
+        allow(Dir).to receive(:glob).and_return ['a gem spec']
+      end
+
+      it 'returns true' do
+        expect(described_class.gem?).to eq true
+      end
+    end
+
+    context 'the project is not a gem' do
+      before do
+        allow(Dir).to receive(:glob).and_return []
+      end
+
+      it 'returns false' do
+        expect(described_class.gem?).to eq false
+      end
+    end
+  end
+
+  describe '.update_gem' do
+    let(:tmp_file) { Tempfile.new(['rake_rack','.gemspec']) }
+
+    before do
+      gemspec = <<-GEM
+        Gem::Specification.new do |spec|
+          spec.name          = "rake_rack"
+          spec.version       = '0.0.5'
+          spec.authors       = ["Richard Vickerstaff"]
+        end
+      GEM
+      tmp_file.write gemspec
+      tmp_file.rewind
+      allow(Dir).to receive(:glob).and_return [tmp_file.path]
+    end
+
+    it 'updates the gem version' do
+      t = Time.local(2014, 7, 16)
+      Timecop.travel(t) do
+        described_class.update_gem 'foo'
+        expect(File.read(tmp_file)).to match(/.*version\s*= 'foo'/)
+      end
+    end
+
+    it 'outputs a message to the user' do
+      expect(described_class).to receive(:puts).with 'Added version to .gemfile'
+      described_class.update_gem 'foo'
+    end
+  end
+
+  describe '.update_to' do
+    before do
+      allow(described_class).to receive(:`).and_return "refs/heads/master"
+    end
+
+    it 'updates the version' do
+      expect(described_class).to receive(:add_history_header).with 'foo'
+      expect(described_class).to receive(:update_gem).with 'foo'
+      expect(described_class).to receive(:commit).with 'foo'
+      expect(described_class).to receive(:tag).with 'foo'
+      expect(described_class).to receive(:`).with 'git symbolic-ref HEAD'
+      expect(described_class).to receive(:puts).with "To push the new tag, use 'git push origin master --tags'"
+      described_class.update_to 'foo'
+    end
+  end
+
+  describe '.add_history_header' do
+    let(:tmp_file) { Tempfile.new('foo').path }
+
+    it 'adds the new headre to the history.rdoc' do
+      t = Time.local(2014, 7, 16)
+      Timecop.travel(t) do
+        described_class.add_history_header 'foo', tmp_file
+        expect(File.read tmp_file).to eq "== foo (16 July 2014)\n\n"
+      end
+    end
+
+    it 'outputs a message to the user' do
+      expect(described_class).to receive(:puts).with 'Added version to history.rdoc'
+      described_class.add_history_header 'foo', tmp_file
+    end
+  end
+
+  describe '.commit' do
+    it 'commits all changes' do
+      expect(described_class).to receive(:`).with "git add . && git commit -m 'increment version to foo'"
+      described_class.commit 'foo'
+    end
+
+    it 'outputs a message to the user' do
+      expect(described_class).to receive(:puts).with 'Committed change'
+      described_class.commit 'foo'
+    end
+  end
+
+  describe '.tag' do
+    it 'it tags the commit with the new version' do
+      expect(described_class).to receive(:`).with 'git tag foo'
+      described_class.tag 'foo'
+    end
+
+    it 'outputs a message to the user' do
+      expect(described_class).to receive(:puts).with 'Tagged with foo'
+      described_class.tag 'foo'
+    end
+  end
+end

data/tasks/version.rake

@@ -1,87 +1,31 @@
-module Rake::Version
-  def self.current_history
-    File.read "history.rdoc"
-  end
-
-  def self.latest_version
-    latest_version_string = current_history[/== ([\d\.]*)/, 1] || "0.0.0"
-    @latest_version ||= latest_version_string.split(".").map(&:to_i)
-    def @latest_version.to_s
-      join "."
-    end
-    @latest_version
-  end
-
-  def self.update_to version
-    add_history_header version
-    update_gem version if gem?
-    commit version
-    tag version
-    branch = `git symbolic-ref HEAD`[%r{.*/(.*)}, 1]
-    puts "To push the new tag, use 'git push origin #{branch} --tags'"
-  end
-
-  def self.add_history_header version
-    history = current_history
-    File.open "history.rdoc", "w" do |f|
-      f.puts "== #{version} (#{Time.now.strftime "%d %B %Y"})"
-      f.puts
-      f.print history
-    end
-    puts "Added version to history.rdoc"
-  end
-
-  def self.update_gem version
-    path = Dir.glob('*.gemspec').first
-    text = File.read path
-    File.open(path, "w") do |file|
-      file.puts text.sub(/(.*version\s*=\s*)(['|"].*['|"])/, "\\1'#{version}'")
-    end
-  end
-
-  def self.commit version
-    `git add . && git commit -m 'increment version to #{version}'`
-    puts "Committed change"
-  end
-
-  def self.tag version
-    `git tag #{version}`
-    puts "Tagged with #{version}"
-  end
-
-  def self.gem?
-    !Dir.glob('*.gemspec').empty?
-  end
-end
-
 desc "Display the latest version (from history.rdoc)"
 task :"rake_rack:version" do
-  puts "Latest version is #{Rake::Version.latest_version}"
+  puts "Latest version is #{RakeRack::Version.latest_version}"
 end
 
 namespace :rake_rack do
   namespace :version do
     desc "Increment the major version in history.rdoc (eg 1.2.3 => 2.0.0)"
     task :major do
-      new_version = Rake::Version.latest_version
+      new_version = RakeRack::Version.latest_version
       new_version[0] += 1
       new_version[1,2] = 0, 0
-      Rake::Version.update_to new_version
+      RakeRack::Version.update_to new_version
     end
 
     desc "Increment the minor version in history.rdoc (eg 1.2.3 => 1.3.0)"
     task :minor do
-      new_version = Rake::Version.latest_version
+      new_version = RakeRack::Version.latest_version
       new_version[1] += 1
       new_version[2] = 0
-      Rake::Version.update_to new_version
+      RakeRack::Version.update_to new_version
     end
 
     desc "Increment the patch version in history.rdoc (eg 1.2.3 => 1.2.4)"
     task :patch do
-      new_version = Rake::Version.latest_version
+      new_version = RakeRack::Version.latest_version
       new_version[2] += 1
-      Rake::Version.update_to new_version
+      RakeRack::Version.update_to new_version
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rake_rack
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Richard Vickerstaff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-16 00:00:00.000000000 Z
+date: 2014-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -54,8 +54,11 @@ files:
 - Rakefile
 - history.rdoc
 - lib/rake_rack.rb
+- lib/version.rb
 - rake_rack.gemspec
 - spec/.keep
+- spec/spec_helper.rb
+- spec/version_spec.rb
 - tasks/code_quality.rake
 - tasks/coverage.rake
 - tasks/karma.rake