rake-version 0.2.1 → 0.3.0

data/.rvmrc

@@ -4,7 +4,7 @@
 # development environment upon cd'ing into the directory
 
 # First we specify our desired <ruby>[@<gemset>], the @gemset name is optional.
-environment_id="ruby-1.9.3@rake-version"
+environment_id="ruby-1.9.2@rake-version"
 
 #
 # First we attempt to load the desired environment directly from the environment

data/.screenrc

@@ -0,0 +1,5 @@
+source $HOME/.screenrc
+
+screen -t vim 0 $EDITOR -c GG
+screen -t zsh 1
+select vim

data/Gemfile

@@ -4,19 +4,17 @@ source "http://rubygems.org"
 #   gem "activesupport", ">= 2.3.5"
 
 gem 'rake', '~> 0.9.2'
-gem 'upoj-rb', '~> 0.0.5'
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem 'rspec', '~> 2.8.0'
-  gem 'shoulda', '~> 2.11.3'
+  gem 'rspec', '~> 2.11.0'
   gem 'bundler'
-  gem 'jeweler', '~> 1.8.3'
-  gem 'simplecov', '~> 0.5.4'
-  gem 'yard', '~> 0.7.5'
+  gem 'jeweler', '~> 1.8.4'
+  gem 'simplecov', '~> 0.6.4'
+  gem 'yard', '~> 0.8.2.1'
   gem 'rdiscount', '~> 1.6.8'
-  gem 'travis-lint', '~> 1.3.0'
+  gem 'travis-lint', '~> 1.4.0'
 end
 
 group :test do

data/Gemfile.lock

@@ -6,38 +6,33 @@ GEM
     activesupport (3.0.0)
     diff-lcs (1.1.3)
     git (1.2.5)
-    hashr (0.0.19)
-    jeweler (1.8.3)
+    hashr (0.0.22)
+    jeweler (1.8.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
       rdoc
-    json (1.6.5)
-    multi_json (1.0.4)
-    paint (0.8.4)
+    json (1.7.5)
+    multi_json (1.3.6)
     rake (0.9.2.2)
     rdiscount (1.6.8)
     rdoc (3.12)
       json (~> 1.4)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
-    shoulda (2.11.3)
-    simplecov (0.5.4)
-      multi_json (~> 1.0.3)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.2)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.11.2)
+    simplecov (0.6.4)
+      multi_json (~> 1.0)
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
-    travis-lint (1.3.0)
+    travis-lint (1.4.0)
       hashr (>= 0.0.19)
-    upoj-rb (0.0.5)
-      active_support (>= 2)
-      paint
-    yard (0.7.5)
+    yard (0.8.2.1)
 
 PLATFORMS
   ruby
@@ -45,12 +40,10 @@ PLATFORMS
 DEPENDENCIES
   active_support (>= 2)
   bundler
-  jeweler (~> 1.8.3)
+  jeweler (~> 1.8.4)
   rake (~> 0.9.2)
   rdiscount (~> 1.6.8)
-  rspec (~> 2.8.0)
-  shoulda (~> 2.11.3)
-  simplecov (~> 0.5.4)
-  travis-lint (~> 1.3.0)
-  upoj-rb (~> 0.0.5)
-  yard (~> 0.7.5)
+  rspec (~> 2.11.0)
+  simplecov (~> 0.6.4)
+  travis-lint (~> 1.4.0)
+  yard (~> 0.8.2.1)

data/README.md

@@ -2,6 +2,11 @@
 
 **Rake tasks for version management.**
 
+Tested with <a href="https://www.relishapp.com/rspec">RSpec</a>, <a href="https://github.com/thoughtbot/shoulda">shoulda</a> and <a href="http://travis-ci.org/#!/AlphaHydrae/rake-version">Travis CI</a>.
+
+* master [![Build Status](https://secure.travis-ci.org/AlphaHydrae/rake-version.png?branch=master)](http://travis-ci.org/AlphaHydrae/rake-version)
+* develop [![Build Status](https://secure.travis-ci.org/AlphaHydrae/rake-version.png?branch=develop)](http://travis-ci.org/AlphaHydrae/rake-version)
+
 ## License (MIT)
 
 Copyright (c) 2011 Alpha Hydrae

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.3.0

data/lib/rake-version.rb

@@ -1,6 +1,5 @@
 
 require 'rake/tasklib'
-require 'active_support/core_ext/hash'
 
 module RakeVersion
   VERSION = File.open(File.join(File.dirname(__FILE__), '..', 'VERSION'), 'r').read

data/lib/rake-version/config.rb

@@ -13,9 +13,7 @@ module RakeVersion
     end
 
     def copy *args
-      options = args.extract_options!
-      args.unshift "src/**/*.#{@extension}" if args.blank?
-      args << options if options.present?
+      args.unshift "src/**/*.#{@extension}" if args.empty?
       @copiers << Copier.new(*args)
       self
     end

data/lib/rake-version/copier.rb

@@ -5,11 +5,11 @@ module RakeVersion
   class Copier
 
     def initialize *args
-      options = HashWithIndifferentAccess.new args.extract_options!
+      @options = args.last.kind_of?(Hash) ? args.pop : {}
 
       @file_patterns = args.collect{ |arg| check_file_pattern arg }
-      @version_pattern = check_version_pattern(options[:version]) || /\d+\.\d+\.\d+/
-      @replace_all = !!options[:all]
+      @version_pattern = check_version_pattern(option(:version)) || /\d+\.\d+\.\d+/
+      @replace_all = !!option(:all)
     end
 
     def copy version, context
@@ -18,6 +18,14 @@ module RakeVersion
 
     private
 
+    def option sym
+      if @options.key? sym
+        @options[sym]
+      elsif @options.key? sym.to_s
+        @options[sym.to_s]
+      end
+    end
+
     def check_file_pattern pattern
       unless [ String, Regexp ].any?{ |klass| pattern.kind_of? klass }
         raise BadFilePattern, "Expected file pattern to be a glob string or regexp, got #{pattern.class.name}."

data/rake-version.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "rake-version"
-  s.version = "0.2.1"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["AlphaHydrae"]
-  s.date = "2012-03-09"
+  s.date = "2012-08-31"
   s.description = "Rake tasks for version management."
   s.email = "hydrae.alpha@gmail.com"
   s.extra_rdoc_files = [
@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
     ".document",
     ".rspec",
     ".rvmrc",
+    ".screenrc",
     ".travis.yml",
     "Gemfile",
     "Gemfile.lock",
@@ -54,38 +55,32 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rake>, ["~> 0.9.2"])
-      s.add_runtime_dependency(%q<upoj-rb>, ["~> 0.0.5"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
-      s.add_development_dependency(%q<shoulda>, ["~> 2.11.3"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.11.0"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
-      s.add_development_dependency(%q<simplecov>, ["~> 0.5.4"])
-      s.add_development_dependency(%q<yard>, ["~> 0.7.5"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
+      s.add_development_dependency(%q<simplecov>, ["~> 0.6.4"])
+      s.add_development_dependency(%q<yard>, ["~> 0.8.2.1"])
       s.add_development_dependency(%q<rdiscount>, ["~> 1.6.8"])
-      s.add_development_dependency(%q<travis-lint>, ["~> 1.3.0"])
+      s.add_development_dependency(%q<travis-lint>, ["~> 1.4.0"])
     else
       s.add_dependency(%q<rake>, ["~> 0.9.2"])
-      s.add_dependency(%q<upoj-rb>, ["~> 0.0.5"])
-      s.add_dependency(%q<rspec>, ["~> 2.8.0"])
-      s.add_dependency(%q<shoulda>, ["~> 2.11.3"])
+      s.add_dependency(%q<rspec>, ["~> 2.11.0"])
       s.add_dependency(%q<bundler>, [">= 0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
-      s.add_dependency(%q<simplecov>, ["~> 0.5.4"])
-      s.add_dependency(%q<yard>, ["~> 0.7.5"])
+      s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+      s.add_dependency(%q<simplecov>, ["~> 0.6.4"])
+      s.add_dependency(%q<yard>, ["~> 0.8.2.1"])
       s.add_dependency(%q<rdiscount>, ["~> 1.6.8"])
-      s.add_dependency(%q<travis-lint>, ["~> 1.3.0"])
+      s.add_dependency(%q<travis-lint>, ["~> 1.4.0"])
     end
   else
     s.add_dependency(%q<rake>, ["~> 0.9.2"])
-    s.add_dependency(%q<upoj-rb>, ["~> 0.0.5"])
-    s.add_dependency(%q<rspec>, ["~> 2.8.0"])
-    s.add_dependency(%q<shoulda>, ["~> 2.11.3"])
+    s.add_dependency(%q<rspec>, ["~> 2.11.0"])
     s.add_dependency(%q<bundler>, [">= 0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
-    s.add_dependency(%q<simplecov>, ["~> 0.5.4"])
-    s.add_dependency(%q<yard>, ["~> 0.7.5"])
+    s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+    s.add_dependency(%q<simplecov>, ["~> 0.6.4"])
+    s.add_dependency(%q<yard>, ["~> 0.8.2.1"])
     s.add_dependency(%q<rdiscount>, ["~> 1.6.8"])
-    s.add_dependency(%q<travis-lint>, ["~> 1.3.0"])
+    s.add_dependency(%q<travis-lint>, ["~> 1.4.0"])
   end
 end
 

data/spec/copier_spec.rb

@@ -30,11 +30,13 @@ describe RakeVersion::Copier do
 
   it "should accept a regexp as the version option" do
     lambda{ RakeVersion::Copier.new :version => /version/ }.should_not raise_error
+    lambda{ RakeVersion::Copier.new 'version' => /version/ }.should_not raise_error
   end
 
   it "should only accept a regexp as the version option" do
     [ true, false, [], {}, Object.new, :symbol ].each do |invalid|
       lambda{ RakeVersion::Copier.new :version => invalid }.should raise_error(RakeVersion::BadVersionPattern)
+      lambda{ RakeVersion::Copier.new 'version' => invalid }.should raise_error(RakeVersion::BadVersionPattern)
     end
   end
 
@@ -74,7 +76,8 @@ describe RakeVersion::Copier do
     end
 
     def mock_file file
-      double("file #{file}", :read => COPIER_SAMPLE_FILES[file].try(:dup), :rewind => nil, :write => nil)
+      contents = COPIER_SAMPLE_FILES[file] ? COPIER_SAMPLE_FILES[file].dup : nil
+      double("file #{file}", :read => contents, :rewind => nil, :write => nil)
     end
 
     it "should copy the version to ruby files with a glob string" do

data/spec/helper.rb

@@ -14,7 +14,6 @@ rescue Bundler::BundlerError => e
 end
 
 require 'rspec'
-require 'shoulda'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rake-version
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-09 00:00:00.000000000Z
+date: 2012-08-31 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70202486870200 !ruby/object:Gem::Requirement
+  requirement: &70340903490360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,43 +21,21 @@ dependencies:
         version: 0.9.2
   type: :runtime
   prerelease: false
-  version_requirements: *70202486870200
-- !ruby/object:Gem::Dependency
-  name: upoj-rb
-  requirement: &70202486865480 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.0.5
-  type: :runtime
-  prerelease: false
-  version_requirements: *70202486865480
+  version_requirements: *70340903490360
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70202486862340 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.8.0
-  type: :development
-  prerelease: false
-  version_requirements: *70202486862340
-- !ruby/object:Gem::Dependency
-  name: shoulda
-  requirement: &70202486859000 !ruby/object:Gem::Requirement
+  requirement: &70340903488920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.11.3
+        version: 2.11.0
   type: :development
   prerelease: false
-  version_requirements: *70202486859000
+  version_requirements: *70340903488920
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70202486854440 !ruby/object:Gem::Requirement
+  requirement: &70340903487440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,43 +43,43 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70202486854440
+  version_requirements: *70340903487440
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70202486850620 !ruby/object:Gem::Requirement
+  requirement: &70340903465520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.3
+        version: 1.8.4
   type: :development
   prerelease: false
-  version_requirements: *70202486850620
+  version_requirements: *70340903465520
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70202486846800 !ruby/object:Gem::Requirement
+  requirement: &70340903463980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: 0.6.4
   type: :development
   prerelease: false
-  version_requirements: *70202486846800
+  version_requirements: *70340903463980
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70202486822220 !ruby/object:Gem::Requirement
+  requirement: &70340903462340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.5
+        version: 0.8.2.1
   type: :development
   prerelease: false
-  version_requirements: *70202486822220
+  version_requirements: *70340903462340
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &70202486812240 !ruby/object:Gem::Requirement
+  requirement: &70340903460760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,18 +87,18 @@ dependencies:
         version: 1.6.8
   type: :development
   prerelease: false
-  version_requirements: *70202486812240
+  version_requirements: *70340903460760
 - !ruby/object:Gem::Dependency
   name: travis-lint
-  requirement: &70202486808560 !ruby/object:Gem::Requirement
+  requirement: &70340903458560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
   type: :development
   prerelease: false
-  version_requirements: *70202486808560
+  version_requirements: *70340903458560
 description: Rake tasks for version management.
 email: hydrae.alpha@gmail.com
 executables: []
@@ -132,6 +110,7 @@ files:
 - .document
 - .rspec
 - .rvmrc
+- .screenrc
 - .travis.yml
 - Gemfile
 - Gemfile.lock
@@ -169,7 +148,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2048815048943686155
+      hash: 979223545522422935
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: