shuhari 0.1.0 → 0.1.1

data/.gitignore

@@ -15,4 +15,6 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.ruby-version
+.ruby-gemset
 .rvmrc

data/features/cucumber_kata.feature

@@ -23,7 +23,7 @@ Feature: Cucumber Kata Generation
     And the file "fizz_buzz/features/support/env.rb" should contain:
       """
       $LOAD_PATH.unshift File.expand_path('../../lib', File.dirname(__FILE__))
-      
+
       require 'fizz_buzz'
       require 'rspec/expectations'
       """
@@ -46,7 +46,10 @@ Feature: Cucumber Kata Generation
     When I run `shuhari new FizzBuzz --cucumber`
     Then the file "fizz_buzz/Gemfile" should contain:
       """
+      source 'https://rubygems.org'
+
       group :development do
+        gem 'shuhari'
         gem 'cucumber'
         gem 'rspec'
         gem 'guard-cucumber'
@@ -54,6 +57,7 @@ Feature: Cucumber Kata Generation
         gem 'growl'
         # gem 'growl_notify'
         # gem 'ruby_gntp'
+        # gem 'terminal-notifier-guard'
         gem 'rb-fsevent'
       end
       """
@@ -63,12 +67,16 @@ Feature: Cucumber Kata Generation
     When I run `shuhari new FizzBuzz --cucumber`
     Then the file "fizz_buzz/Gemfile" should contain:
       """
+      source 'https://rubygems.org'
+
       group :development do
+        gem 'shuhari'
         gem 'cucumber'
         gem 'rspec'
         gem 'guard-cucumber'
         gem 'coolline', :require => false
         gem 'libnotify'
+        # gem 'ruby_gntp'
         gem 'rb-inotify'
       end
       """
@@ -78,12 +86,16 @@ Feature: Cucumber Kata Generation
     When I run `shuhari new FizzBuzz --cucumber`
     Then the file "fizz_buzz/Gemfile" should contain:
       """
+      source 'https://rubygems.org'
+
       group :development do
+        gem 'shuhari'
         gem 'cucumber'
         gem 'rspec'
         gem 'guard-cucumber'
         gem 'rb-notifu'
         gem 'win32console'
+        # gem 'ruby_gntp'
         gem 'wdm'
       end
       """

data/features/getting_help.feature

@@ -4,10 +4,23 @@ Feature: Getting Help
     When I run `shuhari help`
     Then the output should contain:
       """
-      Tasks:
-        shuhari empty        # Restart the Kata with empty mind and project
-        shuhari help [TASK]  # Describe available tasks or one specific task
-        shuhari new [NAME]   # Create a new Kata project
+      Commands:
+        shuhari help [COMMAND]  # Describe available commands or one specific command
+        shuhari new [NAME]      # Create a new Kata project
+      """
+
+  Scenario: General help inside a project
+    Given a file named "shuhari.yml" with:
+      """
+      project_name: FizzBuzz
+      test_framework: rspec
+      """
+    When I run `shuhari help`
+    Then the output should contain:
+      """
+      Commands:
+        shuhari empty           # Restart the Kata with empty mind and project
+        shuhari help [COMMAND]  # Describe available commands or one specific command
       """
 
   Scenario: Help about the "new" task
@@ -31,6 +44,11 @@ Feature: Getting Help
       """
 
   Scenario: Help about the "empty" task
+    Given a file named "shuhari.yml" with:
+      """
+      project_name: FizzBuzz
+      test_framework: rspec
+      """
     When I run `shuhari help empty`
     Then the output should contain:
       """

data/features/minitest_kata.feature

@@ -32,10 +32,10 @@ Feature: Minitest Kata Generation
       """
     And the file "fizz_buzz/Guardfile" should contain:
       """
-      guard 'minitest' do
-        watch(%r|^test/test_(.*)\.rb|)
-        watch(%r|^lib/(.*)\.rb|)            { |m| "test/test_#{m[1]}.rb" }
-        watch(%r|^test/test_helper\.rb|)    { "test" }
+      guard :minitest do
+        watch(%r{^test/(.*)\/?test_(.*)\.rb})
+        watch(%r{^lib/(.*/)?([^/]+)\.rb})     { |m| "test/#{m[1]}test_#{m[2]}.rb" }
+        watch(%r{^test/test_helper\.rb})      { 'test' }
       end
       """
     And the file "fizz_buzz/shuhari.yml" should contain:
@@ -49,13 +49,17 @@ Feature: Minitest Kata Generation
     When I run `shuhari new FizzBuzz --minitest`
     Then the file "fizz_buzz/Gemfile" should contain:
       """
+      source 'https://rubygems.org'
+
       group :development do
+        gem 'shuhari'
         gem 'minitest'
-        gem 'guard-minitest'
+        gem 'guard-minitest', '>= 1.0.0.rc.2'
         gem 'coolline', :require => false
         gem 'growl'
         # gem 'growl_notify'
         # gem 'ruby_gntp'
+        # gem 'terminal-notifier-guard'
         gem 'rb-fsevent'
       end
       """
@@ -65,11 +69,15 @@ Feature: Minitest Kata Generation
     When I run `shuhari new FizzBuzz --minitest`
     Then the file "fizz_buzz/Gemfile" should contain:
       """
+      source 'https://rubygems.org'
+
       group :development do
+        gem 'shuhari'
         gem 'minitest'
-        gem 'guard-minitest'
+        gem 'guard-minitest', '>= 1.0.0.rc.2'
         gem 'coolline', :require => false
         gem 'libnotify'
+        # gem 'ruby_gntp'
         gem 'rb-inotify'
       end
       """
@@ -79,11 +87,15 @@ Feature: Minitest Kata Generation
     When I run `shuhari new FizzBuzz --minitest`
     Then the file "fizz_buzz/Gemfile" should contain:
       """
+      source 'https://rubygems.org'
+
       group :development do
+        gem 'shuhari'
         gem 'minitest'
-        gem 'guard-minitest'
+        gem 'guard-minitest', '>= 1.0.0.rc.2'
         gem 'rb-notifu'
         gem 'win32console'
+        # gem 'ruby_gntp'
         gem 'wdm'
       end
       """

data/features/minitest_spec_kata.feature

@@ -32,10 +32,10 @@ Feature: Minitest::Spec Kata Generation
       """
     And the file "fizz_buzz/Guardfile" should contain:
       """
-      guard 'minitest' do
-        watch(%r|^spec/(.*)_spec\.rb|)
-        watch(%r|^lib/(.*)\.rb|)            { |m| "spec/#{m[1]}_spec.rb" }
-        watch(%r|^spec/spec_helper\.rb|)    { "spec" }
+      guard :minitest do
+        watch(%r{^spec/(.*)_spec\.rb})
+        watch(%r{^lib/(.+)\.rb})         { |m| "spec/#{m[1]}_spec.rb" }
+        watch(%r{^spec/spec_helper\.rb}) { 'spec' }
       end
       """
     And the file "fizz_buzz/shuhari.yml" should contain:
@@ -49,13 +49,17 @@ Feature: Minitest::Spec Kata Generation
     When I run `shuhari new FizzBuzz --minitest_spec`
     Then the file "fizz_buzz/Gemfile" should contain:
       """
+      source 'https://rubygems.org'
+
       group :development do
+        gem 'shuhari'
         gem 'minitest'
-        gem 'guard-minitest'
+        gem 'guard-minitest', '>= 1.0.0.rc.2'
         gem 'coolline', :require => false
         gem 'growl'
         # gem 'growl_notify'
         # gem 'ruby_gntp'
+        # gem 'terminal-notifier-guard'
         gem 'rb-fsevent'
       end
       """
@@ -65,11 +69,15 @@ Feature: Minitest::Spec Kata Generation
     When I run `shuhari new FizzBuzz --minitest_spec`
     Then the file "fizz_buzz/Gemfile" should contain:
       """
+      source 'https://rubygems.org'
+
       group :development do
+        gem 'shuhari'
         gem 'minitest'
-        gem 'guard-minitest'
+        gem 'guard-minitest', '>= 1.0.0.rc.2'
         gem 'coolline', :require => false
         gem 'libnotify'
+        # gem 'ruby_gntp'
         gem 'rb-inotify'
       end
       """
@@ -79,11 +87,15 @@ Feature: Minitest::Spec Kata Generation
     When I run `shuhari new FizzBuzz --minitest_spec`
     Then the file "fizz_buzz/Gemfile" should contain:
       """
+      source 'https://rubygems.org'
+
       group :development do
+        gem 'shuhari'
         gem 'minitest'
-        gem 'guard-minitest'
+        gem 'guard-minitest', '>= 1.0.0.rc.2'
         gem 'rb-notifu'
         gem 'win32console'
+        # gem 'ruby_gntp'
         gem 'wdm'
       end
       """

data/features/rspec_kata.feature

@@ -27,16 +27,25 @@ Feature: RSpec Kata Generation
       require 'fizz_buzz'
       require 'rspec'
 
-      # Requires supporting files with custom matchers and macros, etc,
-      # in ./support/ and its subdirectories.
-      Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
-
       RSpec.configure do |config|
+        config.treat_symbols_as_metadata_keys_with_true_values = true
+        config.run_all_when_everything_filtered = true
+        config.filter_run :focus
+
+        # Run specs in random order to surface order dependencies. If you find an
+        # order dependency and want to debug it, you can fix the order by providing
+        # the seed, which is printed after each run.
+        #     --seed 1234
+        config.order = 'random'
+
+        # Requires supporting files with custom matchers and macros, etc,
+        # in ./support/ and its subdirectories.
+        Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].sort.each { |f| require f }
       end
       """
     And the file "fizz_buzz/Guardfile" should contain:
       """
-      guard 'rspec', :version => 2 do
+      guard 'rspec' do
         watch(%r{^spec/.+_spec\.rb$})
         watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
         watch('spec/spec_helper.rb')  { "spec/" }
@@ -53,13 +62,17 @@ Feature: RSpec Kata Generation
     When I run `shuhari new FizzBuzz --rspec`
     Then the file "fizz_buzz/Gemfile" should contain:
       """
+      source 'https://rubygems.org'
+
       group :development do
+        gem 'shuhari'
         gem 'rspec'
         gem 'guard-rspec'
         gem 'coolline', :require => false
         gem 'growl'
         # gem 'growl_notify'
         # gem 'ruby_gntp'
+        # gem 'terminal-notifier-guard'
         gem 'rb-fsevent'
       end
       """
@@ -69,11 +82,15 @@ Feature: RSpec Kata Generation
     When I run `shuhari new FizzBuzz --rspec`
     Then the file "fizz_buzz/Gemfile" should contain:
       """
+      source 'https://rubygems.org'
+
       group :development do
+        gem 'shuhari'
         gem 'rspec'
         gem 'guard-rspec'
         gem 'coolline', :require => false
         gem 'libnotify'
+        # gem 'ruby_gntp'
         gem 'rb-inotify'
       end
       """
@@ -83,11 +100,15 @@ Feature: RSpec Kata Generation
     When I run `shuhari new FizzBuzz --rspec`
     Then the file "fizz_buzz/Gemfile" should contain:
       """
+      source 'https://rubygems.org'
+
       group :development do
+        gem 'shuhari'
         gem 'rspec'
         gem 'guard-rspec'
         gem 'rb-notifu'
         gem 'win32console'
+        # gem 'ruby_gntp'
         gem 'wdm'
       end
       """

data/features/testunit_kata.feature

@@ -48,13 +48,17 @@ Feature: Test::Unit Kata Generation
     When I run `shuhari new FizzBuzz --testunit`
     Then the file "fizz_buzz/Gemfile" should contain:
       """
+      source 'https://rubygems.org'
+
       group :development do
+        gem 'shuhari'
         gem 'test-unit'
         gem 'guard-test'
         gem 'coolline', :require => false
         gem 'growl'
         # gem 'growl_notify'
         # gem 'ruby_gntp'
+        # gem 'terminal-notifier-guard'
         gem 'rb-fsevent'
       end
       """
@@ -64,11 +68,15 @@ Feature: Test::Unit Kata Generation
     When I run `shuhari new FizzBuzz --testunit`
     Then the file "fizz_buzz/Gemfile" should contain:
       """
+      source 'https://rubygems.org'
+
       group :development do
+        gem 'shuhari'
         gem 'test-unit'
         gem 'guard-test'
         gem 'coolline', :require => false
         gem 'libnotify'
+        # gem 'ruby_gntp'
         gem 'rb-inotify'
       end
       """
@@ -78,11 +86,15 @@ Feature: Test::Unit Kata Generation
     When I run `shuhari new FizzBuzz --testunit`
     Then the file "fizz_buzz/Gemfile" should contain:
       """
+      source 'https://rubygems.org'
+
       group :development do
+        gem 'shuhari'
         gem 'test-unit'
         gem 'guard-test'
         gem 'rb-notifu'
         gem 'win32console'
+        # gem 'ruby_gntp'
         gem 'wdm'
       end
       """

data/lib/shuhari/app.rb

@@ -6,44 +6,49 @@ module Shuhari
     include Thor::Actions
     include ProjectGeneration
 
-    desc 'new [NAME]', 'Create a new Kata project'
+    if File.exists?('shuhari.yml')
+
+      desc 'empty', 'Restart the Kata with empty mind and project'
+      def empty
+        @name = load_setting(:project_name)
+        @framework = load_setting(:test_framework)
+        clean_project
+        setup_source_paths
+        setup_code
+      end
 
-    method_option :rspec, :type => :boolean, :aliases => '-r',
-      :desc => 'Test using RSpec', :default => true
+    else
 
-    method_option :minitest, :type => :boolean, :aliases => '-m',
-      :desc => 'Test using Minitest::Unit'
+      desc 'new [NAME]', 'Create a new Kata project'
 
-    method_option :minitest_spec, :type => :boolean, :aliases => '-s',
-      :desc => 'Test using Minitest::Spec'
+      method_option :rspec, :type => :boolean, :aliases => '-r',
+        :desc => 'Test using RSpec', :default => true
 
-    method_option :testunit, :type => :boolean, :aliases => '-t',
-      :desc => 'Test using Test::Unit'
+      method_option :minitest, :type => :boolean, :aliases => '-m',
+        :desc => 'Test using Minitest::Unit'
 
-    method_option :cucumber, :type => :boolean, :aliases => '-c',
-      :desc => 'Test using Cucumber'
+      method_option :minitest_spec, :type => :boolean, :aliases => '-s',
+        :desc => 'Test using Minitest::Spec'
 
-    if Platform.unix?
-      method_option :gemset, :type => :boolean, :aliases => '-g',
-        :desc => 'Create .rvmrc to use a gemset', :default => Platform.rvm?
-    end
+      method_option :testunit, :type => :boolean, :aliases => '-t',
+        :desc => 'Test using Test::Unit'
+
+      method_option :cucumber, :type => :boolean, :aliases => '-c',
+        :desc => 'Test using Cucumber'
 
-    def new(name=nil)
-      @name = name || ask('Project Name:')
-      setup_source_paths
-      inside snake_name, :verbose => true do
-        self.destination_root = '.'
-        create_project
+      if Platform.unix?
+        method_option :gemset, :type => :boolean, :aliases => '-g',
+          :desc => 'Create .rvmrc to use a gemset', :default => Platform.rvm?
       end
-    end
 
-    desc 'empty', 'Restart the Kata with empty mind and project'
-    def empty
-      @name = load_setting(:project_name)
-      @framework = load_setting(:test_framework)
-      clean_project
-      setup_source_paths
-      setup_code
+      def new(name=nil)
+        @name = name || ask('Project Name:')
+        setup_source_paths
+        inside snake_name, :verbose => true do
+          self.destination_root = '.'
+          create_project
+        end
+      end
     end
 
     protected

data/lib/shuhari/platform.rb

@@ -21,6 +21,10 @@ module Shuhari
       os == :linux
     end
 
+    def windows?
+      os == :windows
+    end
+
     def os
       @os ||= case RUBY_PLATFORM
               when /darwin/ then :osx

data/lib/shuhari/platform_gems.rb

@@ -1,41 +1,19 @@
 require 'shuhari'
+require 'erb'
 
 module Shuhari
   module PlatformGems
+    include Platform
 
-    protected
-
-    def osx_gems
-      unix_gems +
-      [ "gem 'growl'",
-        "# gem 'growl_notify'",
-        "# gem 'ruby_gntp'",
-        "gem 'rb-fsevent'" ]
-    end
-
-    def linux_gems
-      unix_gems +
-      [ "gem 'libnotify'",
-        "gem 'rb-inotify'" ]
-    end
+    TEMPLATES = File.expand_path('../../templates', File.dirname(__FILE__))
+    TEMPLATE_FILE = File.expand_path('platform_gems.erb', TEMPLATES)
 
-    def unix_gems
-      [ "gem 'coolline', :require => false" ]
-    end
-
-    def windows_gems
-      [ "gem 'rb-notifu'",
-        "gem 'win32console'",
-        "gem 'wdm'" ]
-    end
+    protected
 
     def platform_gems
-      case Platform.os
-      when :osx then osx_gems
-      when :linux then linux_gems
-      when :windows then windows_gems
-      else []
-      end.join "\n  "
+      b = binding
+      erb = ERB.new(File.read(TEMPLATE_FILE))
+      erb.result(b).strip
     end
   end
 end

data/lib/shuhari/version.rb

@@ -1,3 +1,3 @@
 module Shuhari
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/templates/cucumber/Gemfile.tt

@@ -1,6 +1,7 @@
-source :rubygems
+source 'https://rubygems.org'
 
 group :development do
+  gem 'shuhari'
   gem 'cucumber'
   gem 'rspec'
   gem 'guard-cucumber'

data/templates/minitest/Gemfile.tt

@@ -1,7 +1,8 @@
-source :rubygems
+source 'https://rubygems.org'
 
 group :development do
+  gem 'shuhari'
   gem 'minitest'
-  gem 'guard-minitest'
+  gem 'guard-minitest', '>= 1.0.0.rc.2'
   <%= platform_gems %>
 end

data/templates/minitest/Guardfile

@@ -1,5 +1,5 @@
-guard 'minitest' do
-  watch(%r|^test/test_(.*)\.rb|)
-  watch(%r|^lib/(.*)\.rb|)            { |m| "test/test_#{m[1]}.rb" }
-  watch(%r|^test/test_helper\.rb|)    { "test" }
+guard :minitest do
+  watch(%r{^test/(.*)\/?test_(.*)\.rb})
+  watch(%r{^lib/(.*/)?([^/]+)\.rb})     { |m| "test/#{m[1]}test_#{m[2]}.rb" }
+  watch(%r{^test/test_helper\.rb})      { 'test' }
 end

data/templates/minitest_spec/Gemfile.tt

@@ -1,7 +1,8 @@
-source :rubygems
+source 'https://rubygems.org'
 
 group :development do
+  gem 'shuhari'
   gem 'minitest'
-  gem 'guard-minitest'
+  gem 'guard-minitest', '>= 1.0.0.rc.2'
   <%= platform_gems %>
 end

data/templates/minitest_spec/Guardfile

@@ -1,5 +1,5 @@
-guard 'minitest' do
-  watch(%r|^spec/(.*)_spec\.rb|)
-  watch(%r|^lib/(.*)\.rb|)            { |m| "spec/#{m[1]}_spec.rb" }
-  watch(%r|^spec/spec_helper\.rb|)    { "spec" }
+guard :minitest do
+  watch(%r{^spec/(.*)_spec\.rb})
+  watch(%r{^lib/(.+)\.rb})         { |m| "spec/#{m[1]}_spec.rb" }
+  watch(%r{^spec/spec_helper\.rb}) { 'spec' }
 end

data/templates/platform_gems.erb

@@ -0,0 +1,18 @@
+<% if osx? %>
+  gem 'coolline', :require => false
+  gem 'growl'
+  # gem 'growl_notify'
+  # gem 'ruby_gntp'
+  # gem 'terminal-notifier-guard'
+  gem 'rb-fsevent'
+<% elsif linux? %>
+  gem 'coolline', :require => false
+  gem 'libnotify'
+  # gem 'ruby_gntp'
+  gem 'rb-inotify'
+<% elsif windows? %>
+  gem 'rb-notifu'
+  gem 'win32console'
+  # gem 'ruby_gntp'
+  gem 'wdm'
+<% end %>

data/templates/rspec/Gemfile.tt

@@ -1,6 +1,7 @@
-source :rubygems
+source 'https://rubygems.org'
 
 group :development do
+  gem 'shuhari'
   gem 'rspec'
   gem 'guard-rspec'
   <%= platform_gems %>

data/templates/rspec/Guardfile

@@ -1,4 +1,4 @@
-guard 'rspec', :version => 2 do
+guard 'rspec' do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')  { "spec/" }

data/templates/rspec/spec/spec_helper.rb.tt

@@ -1,9 +1,18 @@
 require '<%= snake_name %>'
 require 'rspec'
 
-# Requires supporting files with custom matchers and macros, etc,
-# in ./support/ and its subdirectories.
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
-
 RSpec.configure do |config|
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.run_all_when_everything_filtered = true
+  config.filter_run :focus
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = 'random'
+
+  # Requires supporting files with custom matchers and macros, etc,
+  # in ./support/ and its subdirectories.
+  Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].sort.each { |f| require f }
 end

data/templates/testunit/Gemfile.tt

@@ -1,6 +1,7 @@
-source :rubygems
+source 'https://rubygems.org'
 
 group :development do
+  gem 'shuhari'
   gem 'test-unit'
   gem 'guard-test'
   <%= platform_gems %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shuhari
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-04 00:00:00.000000000 Z
+date: 2013-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -49,7 +49,6 @@ files:
 - features/minitest_kata.feature
 - features/minitest_spec_kata.feature
 - features/rspec_kata.feature
-- features/step_definitions/steps.rb
 - features/support/env.rb
 - features/testunit_kata.feature
 - lib/shuhari.rb
@@ -75,6 +74,7 @@ files:
 - templates/minitest_spec/Guardfile
 - templates/minitest_spec/spec/kata_spec.rb.tt
 - templates/minitest_spec/spec/spec_helper.rb.tt
+- templates/platform_gems.erb
 - templates/rspec/Gemfile.tt
 - templates/rspec/Guardfile
 - templates/rspec/spec/kata_spec.rb.tt
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: TDD Kata project generator
@@ -113,7 +113,6 @@ test_files:
 - features/minitest_kata.feature
 - features/minitest_spec_kata.feature
 - features/rspec_kata.feature
-- features/step_definitions/steps.rb
 - features/support/env.rb
 - features/testunit_kata.feature
 has_rdoc: 

data/features/step_definitions/steps.rb

@@ -1,5 +0,0 @@
-# This step was copied verbatim from the aruba master branch but it's not yet
-# in the released gem as of version 0.4.11
-Then /^the file "([^"]*)" should contain:$/ do |file, partial_content|
-  check_file_content(file, partial_content, true)
-end