matthewtodd-shoe 0.1.5 → 0.1.6

data/Rakefile

@@ -1,7 +1,7 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), 'lib'))
 require 'shoe'
 
-Shoe.tie('shoe', '0.1.5', "You probably don't want to use Shoe.") do |spec|
+Shoe.tie('shoe', '0.1.6', "You probably don't want to use Shoe.") do |spec|
   spec.remove_development_dependency_on_shoe
   spec.requirements = ['git']
   spec.add_runtime_dependency 'cucumber'

data/bin/shoe

@@ -4,8 +4,10 @@ if File.exists?('Rakefile')
   abort 'Rakefile exists. Not clobbering.'
 end
 
+project_name = File.basename(File.expand_path(Dir.pwd))
+
 File.open('Rakefile', 'w') do |file|
-  file.write <<-END_RAKEFILE.gsub('NAME', File.basename(File.expand_path(Dir.pwd)))
+  file.write <<-END_RAKEFILE.gsub('NAME', project_name)
 this_rakefile_uses_shoe = <<END
 ----------------------------------------
 Please install Shoe:
@@ -27,3 +29,15 @@ Shoe.tie('NAME', '0.1.0', 'TODO write a summary of NAME here.') do |spec|
 end
   END_RAKEFILE
 end
+
+if File.exists?('README.rdoc')
+  abort 'README.rdoc exists. Not clobbering.'
+end
+
+File.open('README.rdoc', 'w') do |file|
+  file.write <<-END_README.gsub('NAME', project_name.capitalize)
+= NAME
+
+NAME is one of my favorite things! Let me tell you about it:
+  END_README
+end

data/lib/shoe.rb

@@ -28,7 +28,7 @@ class Shoe
       spec.name             = name
       spec.version          = version
       spec.summary          = summary
-      spec.files            = FileList['Rakefile', '*.rdoc', 'bin/**/*', 'features/**/*', 'lib/**/*', 'resources/**/*', 'test/**/*'].to_a
+      spec.files            = FileList['Rakefile', '*.gemspec', '*.rdoc', 'bin/**/*', 'features/**/*', 'lib/**/*', 'resources/**/*', 'test/**/*'].to_a
       spec.executables      = everything_in_the_bin_directory
       spec.rdoc_options     = %W(--main README.rdoc --title #{name}-#{version} --inline-source) # MAYBE include --all, so that we document private methods?
       spec.extra_rdoc_files = FileList['*.rdoc'].to_a
@@ -45,25 +45,32 @@ class Shoe
 
   # This is where the magic happens.
   def define_tasks
-    desc 'Remove ignored files'
-    task :clean do
-      sh 'git clean -fdX'
+    if File.directory?('.git')
+      desc 'Remove ignored files'
+      task :clean do
+        sh 'git clean -fdX'
+      end
     end
 
-    desc 'Generate documentation'
-    task :rdoc do
-      LocalDocManager.new(spec).generate_rdoc
-      sh 'open rdoc/index.html' if RUBY_PLATFORM =~ /darwin/
+    if File.directory?('lib')
+      desc 'Generate documentation'
+      task :rdoc do
+        LocalDocManager.new(spec).generate_rdoc
+        sh 'open rdoc/index.html' if RUBY_PLATFORM =~ /darwin/
+      end
     end
 
-    desc 'Run an irb console'
-    task :shell do
-      # MAYBE include -Iext. I think I'd like to wait until I handle C extensions in general.
-      exec 'irb', '-Ilib', "-r#{spec.name}"
+    if File.file?("lib/#{spec.name}.rb")
+      desc 'Run an irb console'
+      task :shell do
+        # MAYBE include -Iext. I think I'd like to wait until I handle C extensions in general.
+        exec 'irb', '-Ilib', "-r#{spec.name}"
+      end
     end
 
     if File.directory?('test')
       require 'rake/testtask'
+      # MAYBE be a little more forgiving in test selection, using test/**/*_test.rb. Or create suites based on subdirectory?
       Rake::TestTask.new { |task| task.pattern = 'test/*_test.rb' }
       default_depends_on(:test)
     end
@@ -74,7 +81,7 @@ class Shoe
       default_depends_on(:features)
     end
 
-    if these_shell_commands_all_succeed(there_is_no_tag_for_the_current_version, we_are_on_the_master_branch, there_is_a_remote_called_origin)
+    if there_is_no_tag_for_the_current_version && we_are_on_the_master_branch && we_have_already_pushed_the_master_branch_to_a_remote_called_origin
       desc "Release #{spec.name}-#{spec.version}"
       task :release do
         File.open("#{spec.name}.gemspec", 'w') { |f| f.write spec.to_ruby }
@@ -98,25 +105,19 @@ class Shoe
     File.directory?('bin') ? Dir.entries('bin') - ['.', '..'] : []
   end
 
-  # I'm guessing it's a little faster shell out to all these commands
-  # together, rather than running each one separately.
-  def these_shell_commands_all_succeed(*commands)
-    system(commands.join(' && '))
-  end
-
   def there_is_no_tag_for_the_current_version
-    "[[ -z `git tag -l #{spec.version}` ]]"
+    !File.file?(".git/refs/tags/#{spec.version}")
   end
 
   def we_are_on_the_master_branch
-    "git branch | grep -q '* master'"
+    File.file?('.git/HEAD') && File.read('.git/HEAD').strip == 'ref: refs/heads/master'
   end
 
-  def there_is_a_remote_called_origin
-    'git remote | grep -q origin'
+  def we_have_already_pushed_the_master_branch_to_a_remote_called_origin
+    File.file?('.git/refs/remotes/origin/master')
   end
 
-  # Using Gem::DocManager instead of Rake::RdocTask means you get to see your
+  # Using Gem::DocManager instead of Rake::RDocTask means you get to see your
   # rdoc *exactly* as users who install your gem will.
   class LocalDocManager < Gem::DocManager #:nodoc:
     def initialize(spec)

data/shoe.gemspec

@@ -0,0 +1,36 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{shoe}
+  s.version = "0.1.6"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Matthew Todd"]
+  s.date = %q{2009-07-24}
+  s.default_executable = %q{shoe}
+  s.email = %q{matthew.todd@gmail.com}
+  s.executables = ["shoe"]
+  s.extra_rdoc_files = ["README.rdoc"]
+  s.files = ["Rakefile", "shoe.gemspec", "README.rdoc", "bin/shoe", "lib/shoe.rb"]
+  s.rdoc_options = ["--main", "README.rdoc", "--title", "shoe-0.1.6", "--inline-source"]
+  s.require_paths = ["lib"]
+  s.requirements = ["git"]
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{You probably don't want to use Shoe.}
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<cucumber>, [">= 0"])
+      s.add_runtime_dependency(%q<rake>, [">= 0"])
+    else
+      s.add_dependency(%q<cucumber>, [">= 0"])
+      s.add_dependency(%q<rake>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<cucumber>, [">= 0"])
+    s.add_dependency(%q<rake>, [">= 0"])
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: matthewtodd-shoe
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors: 
 - Matthew Todd
@@ -42,6 +42,7 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - Rakefile
+- shoe.gemspec
 - README.rdoc
 - bin/shoe
 - lib/shoe.rb
@@ -52,7 +53,7 @@ rdoc_options:
 - --main
 - README.rdoc
 - --title
-- shoe-0.1.5
+- shoe-0.1.6
 - --inline-source
 require_paths: 
 - lib