tumbler 0.0.10 → 0.0.11

data/CHANGELOG

@@ -1,3 +1,8 @@
+== 0.0.11
+
+* Use custom matcher for searching in file. (Joshua Hull, 8d16801)
+* add tests for to check constant_name and also to handle '-' => :: (Arthur Chiu, 824e022)
+
 == 0.0.10
 
 * Added preflight task for easy injection of arbitrary code before tumbler runs. (Joshua Hull, bdb7ed7)

data/lib/tumbler/generate.rb

@@ -37,7 +37,9 @@ module Tumbler
     end
 
     def constant_name
-      @name.split('_').map{|p| p.capitalize}.join
+      result = @name.split('_').map{|p| p.capitalize}.join
+      result = result.split('-').map{|q| q.capitalize}.join('::') if result =~ /-/
+      result
     end
 
     def write

data/lib/tumbler/version.rb

@@ -1,3 +1,3 @@
 module Tumbler
-  VERSION = '0.0.10'
+  VERSION = '0.0.11'
 end

data/spec/changelog_spec.rb

@@ -17,8 +17,7 @@ describe Tumbler::Manager::Changelog do
       Tumbler::Gem.any_instance.stubs(:push).once.returns(true)
       tumbler.bump_and_push(:tiny)
       tumbler.version.to_s.should == '0.0.1'
-      changelog = File.read(tumbler.changelog.file)
-      changelog.should match(/== 0\.0\.1\s+\* added file2 \(.*?, [a-f0-9]{7}\)\s+\* added file1 \(.*?, [a-f0-9]{7}\)/)
+      tumbler.changelog.file.should match_in_file(/== 0\.0\.1\s+\* added file2 \(.*?, [a-f0-9]{7}\)\s+\* added file1 \(.*?, [a-f0-9]{7}\)/)
     }
   end
 
@@ -50,5 +49,4 @@ describe Tumbler::Manager::Changelog do
       tumbler.sh('git log').split(/\n/)[0].should == "commit #{current_rev}"
     }
   end
-
-end
+end

data/spec/generate_spec.rb

@@ -13,6 +13,20 @@ describe Tumbler::Generate do
     end
   end
 
+  it "should generate the gem constant correctly with -" do
+    temp_dir('test') do |test_dir|
+      Tumbler::Generate.app(test_dir, 'my-gem', :changelog => nil).write
+      File.join(test_dir, 'lib','my-gem','version.rb').should match_in_file(/My::Gem/)
+    end
+  end
+
+  it "should generate the gem constant correctly with _" do
+    temp_dir('test') do |test_dir|
+      Tumbler::Generate.app(test_dir, 'my_gem', :changelog => nil).write
+      File.join(test_dir, 'lib','my_gem','version.rb').should match_in_file(/MyGem/)
+    end
+  end
+
   it "should generate a gemspec" do
     temp_dir('test') do |test_dir|
       Tumbler::Generate.app(test_dir, 'mygem').write
@@ -32,9 +46,9 @@ describe Tumbler::Generate do
     temp_dir('test2') do |test_dir|
       Tumbler::Generate.app(test_dir, 'mygem', :dependencies => 'eventmachine').write
       spec = Gem::Specification.load("#{test_dir}/mygem.gemspec")
-      spec.dependencies.size.should == 2
       spec.dependencies.should include(Gem::Dependency.new('tumbler', '>=0', :development))
       spec.dependencies.should include(Gem::Dependency.new('eventmachine', '>=0', :runtime))
+      spec.dependencies.size.should == 2
     end
   end
 
@@ -42,9 +56,9 @@ describe Tumbler::Generate do
     temp_dir('test2') do |test_dir|
       Tumbler::Generate.app(test_dir, 'mygem', :dependencies => [['eventmachine', '>=1.0.0']]).write
       spec = Gem::Specification.load("#{test_dir}/mygem.gemspec")
-      spec.dependencies.size.should == 2
       spec.dependencies.should include(Gem::Dependency.new('tumbler', '>=0', :development))
       spec.dependencies.should include(Gem::Dependency.new('eventmachine', '>=1.0.0', :runtime))
+      spec.dependencies.size.should == 2
     end
   end
 end

data/spec/spec_helper.rb

@@ -50,4 +50,35 @@ def temp_dir(name)
   else
     dir
   end
-end
+end
+
+module Matchers
+  class MatchInFile
+    def initialize(pattern)
+      @pattern = pattern
+    end
+
+    def matches?(file)
+      @file = file
+      @file = File.exist?(file) ? File.read(file) : false
+      @file and @file =~ @pattern
+    end
+    
+    def failure_message
+      "expected #{@pattern} to match in '#{@file}'"
+    end
+
+    def negative_failure_message
+      "expected #{@pattern} to not match in '#{@file}'"
+    end
+  end
+  
+  def match_in_file(expected)
+    MatchInFile.new(expected)
+  end
+  
+end
+
+Spec::Runner.configure do |config|  
+  config.include(Matchers)
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tumbler
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 0
-  - 10
-  version: 0.0.10
+  - 11
+  version: 0.0.11
 platform: ruby
 authors: 
 - Joshua Hull
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-17 00:00:00 -04:00
+date: 2010-06-18 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency