tumbler 0.0.15 → 0.0.16

data/CHANGELOG

@@ -1,3 +1,9 @@
+== 0.0.16
+
+* No longer need to manipulate $" (Joshua Hull, 4f9eee3)
+* Favour creating an explicit helper vs using a constant (Joshua Hull, 3b42cae)
+* Remove space before parentheses. (Joshua Hull, 1a08408)
+
 == 0.0.15
 
 * Nicer output for generation and updating (Joshua Hull, ef03bbe)

data/README.rdoc

@@ -66,6 +66,38 @@ If you'd prefer to have the tumbler tasks namespaced, provide use_rake_tasks wit
 
   Tumbler.use_rake_tasks('tumbler')
 
+Within your gemspec then, you would have something like tumbler's gemspec:
+
+  # -*- encoding: utf-8 -*-
+  
+  require 'lib/tumbler'
+  
+  tumbler = Tumbler::GemspecHelper.new
+  
+  Gem::Specification.new do |s|
+    s.name = tumbler.name
+    s.version = tumbler.version
+  
+    s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+    s.rubyforge_project = tumbler.name
+    s.authors = ["Joshua Hull"]
+    s.date = tumbler.date
+    s.description = "Let's make gem development fun! Tumbler provides common gem management tasks using a common set of 'best practices' out of the box."
+    s.summary = "Common gem generation and management tasks"
+    s.email = %q{joshbuddy@gmail.com}
+    s.extra_rdoc_files = tumbler.files('README.rdoc')
+    s.files = tumbler.files
+    s.homepage = %q{http://github.com/joshbuddy/tumbler}
+    s.rdoc_options = ["--charset=UTF-8"]
+    s.require_paths = ["lib"]
+    s.rubygems_version = %q{1.3.7}
+    s.test_files = tumbler.files(/^spec/)
+    s.executables = tumbler.bin_files
+  
+    # dependencies
+    tumbler.inject_dependencies(s)
+  end
+
 === Available Rake Tasks
 
 Once you've got Tumbler up and running in your gem, you will have access to the following tasks:

data/lib/template/generic.gemspec.erb

@@ -1,25 +1,25 @@
 # -*- encoding: utf-8 -*-
 
-require 'tumbler/gemspec'
+require 'tumbler'
+tumbler = Tumbler::GemspecHelper.new
 
 Gem::Specification.new do |s|
-  s.name = <%= @name.inspect %>
-  s.version = Tumbler::Gemspec.version
-
+  s.name = tumbler.name
+  s.version = tumbler.version
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.rubyforge_project = <%= @name.inspect %>
+  s.rubyforge_project = tumbler.name
   s.authors = <%=[git_name].inspect%>
-  s.date = Tumbler::Gemspec.date
+  s.date = tumbler.date
   s.description = %q{Description}
   s.email = <%=git_email.inspect%>
-  s.files = Tumbler::Gemspec.files
+  s.files = tumbler.files
   # s.homepage = %q{http://github.com/<%= github_user %>/<%= @name %>}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{This is awesome.}
-  s.test_files = Tumbler::Gemspec.files(/^test/)
+  s.test_files = tumbler.files(/^test/)
 
   # dependencies
-  Tumbler::Gemspec.inject_dependencies(s)
+  tumbler.inject_dependencies(s)
 end

data/lib/tumbler/gemspec.rb

@@ -1,3 +1,16 @@
+warn <<-HERE_DOC
+It's probably a lot better to use Tumbler within your gemspec the follow way:
+
+  require 'tumbler'
+  tumbler = Tumbler::GemspecHelper.new
+
+As opposed to:
+
+  require 'tumbler/gemspec'
+
+The gemspec helper will have all the same methods as the Tumbler::Gemspec constant used before.
+HERE_DOC
+
 require File.join(File.dirname(__FILE__), '..', 'tumbler') unless Kernel.const_defined?(:Tumbler)
 root = File.expand_path(File.dirname(Callsite.parse(caller).find{|c| c.filename =~ /\.gemspec$/}.filename))
 Tumbler.send(:remove_const, :Gemspec) if (Tumbler.const_defined?(:Gemspec))

data/lib/tumbler/gemspec_helper.rb

@@ -1,6 +1,10 @@
 module Tumbler
   class GemspecHelper
-    def initialize(manager)
+    def initialize(manager = nil)
+      unless manager
+        root = File.expand_path(File.dirname(Callsite.parse(caller).find{|c| c.filename =~ /\.gemspec$/}.filename))
+        manager = Tumbler.load(root)
+      end
       @manager = manager
     end
 

data/lib/tumbler/informer.rb

@@ -6,7 +6,7 @@ module Tumbler
     Colors = [:green, :cyan, :blue, :magenta]
     
     def inform(msg, &block)
-      $stderr.puts (' ' * $informer_indent << msg.color(Colors[$informer_indent % Colors.size]))
+      $stderr.puts(' ' * $informer_indent << msg.color(Colors[$informer_indent % Colors.size]))
       $informer_indent += 1
       begin
         block.call if block

data/lib/tumbler/updater.rb

@@ -42,7 +42,7 @@ module Tumbler
   raise # (see below)
 
   # You probably want to use inject the dependencies using either
-  # add_bundler_depenedencies or Tumbler::Gemspec.inject_dependencies(spec) (where spec is your Gemspec)
+  # add_bundler_depenedencies or tumbler.inject_dependencies(spec) (where spec is your Gemspec)
               HERE_DOC
             end
           end

data/lib/tumbler/version.rb

@@ -1,3 +1,3 @@
 module Tumbler
-  VERSION = '0.0.15'
+  VERSION = '0.0.16'
 end

data/test/changelog_test.rb

@@ -2,7 +2,6 @@ require File.join(File.dirname(__FILE__),'teststrap')
 
 context "Manager::Changelog" do
   setup { $".delete "tumbler/gemspec.rb" }
-  teardown { $".delete "tumbler/gemspec.rb" } # we need to delete this so each gemspec can be generated fresh
 
   context "generates changelog" do
     setup { @tumbler, @dir, @test_dir = create_app('test') }

data/test/generate_test.rb

@@ -2,7 +2,6 @@ require File.join(File.dirname(__FILE__),'teststrap')
 
 context "Generate" do
   setup { @test_dir = temp_dir('test') }
-  teardown { $".delete "tumbler/gemspec.rb" } # we need to delete this so each gemspec can be generated fresh
   teardown{ FileUtils.rm_rf(@test_dir) }
 
   context "suppress changelog creation if disabled" do

data/test/updater_test.rb

@@ -12,7 +12,6 @@ context "Updater" do
   end
   teardown do
     FileUtils.rm_rf @target
-    $".delete "tumbler/gemspec.rb" # we need to delete this so each gemspec can be generated fresh
   end
 
   context "fetches the version number" do
@@ -65,7 +64,7 @@ context "Updater" do
       Tumbler::Updater.new("#{@target}/rails", :name => 'rails').update
     end
     asserts("finds inject_dependencies once") do
-      File.read("#{@target}/rails/rails.gemspec").scan(/Tumbler::Gemspec.inject_dependencies/)
+      File.read("#{@target}/rails/rails.gemspec").scan(/tumbler.inject_dependencies/)
     end.size 1
   end
 

data/tumbler.gemspec

@@ -1,27 +1,29 @@
 # -*- encoding: utf-8 -*-
 
-require 'lib/tumbler/gemspec'
+require 'lib/tumbler'
+
+tumbler = Tumbler::GemspecHelper.new
 
 Gem::Specification.new do |s|
-  s.name = Tumbler::Gemspec.name
-  s.version = Tumbler::Gemspec.version
+  s.name = tumbler.name
+  s.version = tumbler.version
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.rubyforge_project = Tumbler::Gemspec.name
+  s.rubyforge_project = tumbler.name
   s.authors = ["Joshua Hull"]
-  s.date = Tumbler::Gemspec.date
+  s.date = tumbler.date
   s.description = "Let's make gem development fun! Tumbler provides common gem management tasks using a common set of 'best practices' out of the box."
   s.summary = "Common gem generation and management tasks"
   s.email = %q{joshbuddy@gmail.com}
-  s.extra_rdoc_files = Tumbler::Gemspec.files('README.rdoc')
-  s.files = Tumbler::Gemspec.files
+  s.extra_rdoc_files = tumbler.files('README.rdoc')
+  s.files = tumbler.files
   s.homepage = %q{http://github.com/joshbuddy/tumbler}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
-  s.test_files = Tumbler::Gemspec.files(/^spec/)
-  s.executables = Tumbler::Gemspec.bin_files
+  s.test_files = tumbler.files(/^spec/)
+  s.executables = tumbler.bin_files
 
   # dependencies
-  Tumbler::Gemspec.inject_dependencies(s)
+  tumbler.inject_dependencies(s)
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tumbler
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 63
   prerelease: false
   segments: 
   - 0
   - 0
-  - 15
-  version: 0.0.15
+  - 16
+  version: 0.0.16
 platform: ruby
 authors: 
 - Joshua Hull