gem-this 0.3.5 → 0.3.6

data/Rakefile

@@ -20,7 +20,7 @@ spec = Gem::Specification.new do |s|
 
   # Change these as appropriate
   s.name              = "gem-this"
-  s.version           = "0.3.5"
+  s.version           = "0.3.6"
   s.summary           = "Make existing code into a gem, without any fuss."
   s.author            = "James Adam"
   s.email             = "james@lazyatom.com"
@@ -80,18 +80,21 @@ task :clean => [:clobber_rdoc, :clobber_package] do
 end
 
 desc 'Tag the repository in git with gem version number'
-task :tag => [:gemspec, :package] do
-  if `git diff --cached`.empty?
+task :tag do
+  changed_files = `git diff --cached --name-only`.split("\n") + `git diff --name-only`.split("\n")
+  if changed_files == ['Rakefile']
+    Rake::Task["package"].invoke
+  
     if `git tag`.split("\n").include?("v#{spec.version}")
       raise "Version #{spec.version} has already been released"
     end
-    `git add #{File.expand_path("../#{spec.name}.gemspec", __FILE__)}`
+    `git add #{File.expand_path("../#{spec.name}.gemspec", __FILE__)} Rakefile`
     `git commit -m "Released version #{spec.version}"`
     `git tag v#{spec.version}`
     `git push --tags`
     `git push`
   else
-    raise "Unstaged changes still waiting to be committed"
+    raise "Repository contains uncommitted changes; either commit or stash."
   end
 end
 

data/lib/gem_this.rb

@@ -9,7 +9,7 @@ class GemThis
   class << self
     attr_accessor :custom_task_file
   end
-  self.custom_task_file = File.expand_path("~/.gem-this")
+  self.custom_task_file = ENV['HOME'] && File.expand_path("~/.gem-this")
 
   attr_reader :name, :debug
 
@@ -23,7 +23,9 @@ class GemThis
   def create_rakefile
     template = ERB.new File.read(File.join(File.dirname(__FILE__), '..', 'Rakefile.erb')), nil, '<>'
     rakefile = template.result(binding)
-    rakefile += "\n" + File.read(self.class.custom_task_file) if File.exist?(self.class.custom_task_file)
+    if self.class.custom_task_file && File.exist?(self.class.custom_task_file)
+      rakefile += "\n" + File.read(self.class.custom_task_file)
+    end
 
     if debug
       puts rakefile

data/test/gem_this_test.rb

@@ -110,4 +110,24 @@ end
       assert_rake_task :custom_task
     end
   end
+
+  context "When the user has no .gem-this file specified" do
+    setup do
+      GemThis.custom_task_file = nil
+    end
+
+    should "not raise exception when building gem" do
+      assert_nothing_raised { build_gem {} }
+    end
+  end
+
+  context "When the specified .gem-this file does not exist" do
+    setup do
+      GemThis.custom_task_file = "hopefully/this/file/doesnt/exist"
+    end
+
+    should "not raise exception when building gem" do
+      assert_nothing_raised { build_gem {} }
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gem-this
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 3
-  - 5
-  version: 0.3.5
+  - 6
+  version: 0.3.6
 platform: ruby
 authors: 
 - James Adam
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-21 00:00:00 +00:00
+date: 2011-01-16 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency