kata 1.0.10 → 1.1.0

data/bin/kata

@@ -1,7 +1,10 @@
+#!/bin/env ruby
 require 'kata'
+require 'ostruct'
+require 'optparse'
 
 def usage
-  puts(<<EOF); exit 1
+  return <<EOF
 NAME
     kata - Ruby kata management
 
@@ -13,8 +16,9 @@ DESCRIPTION
     practice of writing code through repitition.
 
 PRIMARY COMMANDS
-    kata setup file
-        Setup a github repo for the kata development session
+    kata setup file [repository]
+        Setup a github repo for the kata development session.  Use a repository
+        if it is provided and do not create a new one
 
     kata take file
         Start a kata development session
@@ -27,19 +31,30 @@ PRIMARY COMMANDS
 EOF
 end
 
-begin
-  argument = ARGV[0].downcase.to_sym
-rescue 
-  usage
-end
+options = OpenStruct.new(
+  {
+    :repo => true,
+  }
+)
+
+OptionParser.new do |opts|
+  opts.banner = usage
+
+  opts.on('-n', '--no-repo', 'Do not create a new repository') do
+    options.repo = false
+  end
+end.parse!
+
+options.action = ARGV.shift.downcase.to_sym
+options.file = ARGV.shift
 
-case argument
+case options.action
   when :setup
-    raise ArgumentError unless ARGV[1] && File.exists?(ARGV[1])
+    raise ArgumentError unless options.file && File.exists?(options.file)
 
     name = nil
 
-    File.open(ARGV[1]).each do |line|
+    File.open(options.file).each do |line|
       if line.match /^kata *\"([^\"]*)\" *do$/
         name = $1
         break
@@ -48,11 +63,11 @@ case argument
 
     setup = Kata::Setup.new name
     setup.build_tree
-    setup.create_repo rescue Exception
+    setup.create_repo(options) rescue Exception
   when :take
-    load ARGV[1]
+    load options.file
   when :version
     puts "kata #{Kata::VERSION}"
   else
-    usage
+    puts usage
 end

data/lib/kata/setup.rb

@@ -11,7 +11,7 @@ module Kata
       self.repo_name = kata_name
     end
 
-    def create_repo
+    def create_repo options
       # Setup from github configuration
       raise Exception, 'Git not installed' unless system 'which git > /dev/null'
 
@@ -31,24 +31,31 @@ module Kata
       repo_params = "-d 'name=#{repo_name}' -d 'description=code+kata+repo'"
 
       # Create the repo on github
-      print 'Creating github repo...'
-      raise SystemCallError, 'unable to use curl to create repo on github' unless system <<-EOF
-        curl -s #{user_string} #{repo_params} #{github.url}repos/create 2>&1 > /dev/null;
-      EOF
-      puts 'complete'
+      if options.repo
+        print 'Creating github repo...'
+        raise SystemCallError, 'unable to use curl to create repo on github' unless system <<-EOF
+          curl -s #{user_string} #{repo_params} #{github.url}repos/create 2>&1 > /dev/null;
+        EOF
+        puts 'complete'
+      end
 
       # publish to github
 
       print 'creating files for repo and initializing...'
-      raise SystemCallError, 'unable to publish repo to github' unless system <<-EOF
-        cd #{repo_name};
-        touch results.txt
-        git init 2>&1 > /dev/null;
-        git add README .rspec results.txt lib/ spec/ 2>&1 > /dev/null;
-        git commit -m 'starting kata' 2>&1 > /dev/null;
-        git remote add origin git@github.com:#{github.user}/#{repo_name}.git 2>&1 > /dev/null;
-        git push origin master 2> /dev/null
-      EOF
+
+      cmd = "cd #{repo_name};"
+      if options.repo
+        cmd << "git init 2>&1 > /dev/null;"
+        cmd << "git add README .rspec lib/ spec/ 2>&1 > /dev/null;"
+      else
+        cmd << "git add #{ENV['PWD']}/#{repo_name};"
+      end
+      cmd << "git commit -m 'starting kata' 2>&1 > /dev/null;"
+      cmd << "git remote add origin git@github.com:#{github.user}/#{repo_name}.git 2>&1 > /dev/null;" if options.repo
+      cmd << 'git push origin master 2> /dev/null'
+
+      raise SystemCallError, 'unable to add files to github repo' unless system(cmd)
+
       puts 'done'
       puts "You can now change directories to #{repo_name} and take your kata"
     end
@@ -95,7 +102,7 @@ require '#{use_kata_name}'
 describe #{class_name} do
   describe "new" do
     it "should instantiate" do
-      lambda {
+      expect {
         #{class_name}.new
       }.should_not raise_exception
     end

data/lib/kata/version.rb

@@ -1,3 +1,3 @@
 module Kata
-  VERSION = '1.0.10'
+  VERSION = '1.1.0'
 end

data/spec/kata_spec.rb

@@ -2,15 +2,15 @@ require 'spec_helper'
 require 'kata/version'
 
 describe 'kata shell' do
-  it "should exit with status 1" do
-    system "ruby -I lib bin/kata 1> /dev/null"
-    $?.exitstatus.should == 1
-  end
+  #it "should exit with status 1" do
+    #system "ruby -I lib bin/kata 1> /dev/null"
+    #$?.exitstatus.should == 1
+  #end
 
   it "should display the version" do
     %x{ruby -I lib bin/kata version}.chomp.should == "kata #{Kata::VERSION}"
   end
-  
+
   it "should run the kata" do
     File.open('test_sample.rb', 'w') do |file|
       file.write <<-EOF

metadata

@@ -1,39 +1,41 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: kata
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.1.0
   prerelease: 
-  version: 1.0.10
 platform: ruby
-authors: 
+authors:
 - Wes
 - Bailey
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-05 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-05-03 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: bundler
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
-  version_requirements: *id001
-description: This DSL provides an easy way for you to write a code kata for pairing exercises or individual testing
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+description: This DSL provides an easy way for you to write a code kata for pairing
+  exercises or individual testing
 email: baywes@gmail.com
-executables: 
+executables:
 - kata
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/kata/base.rb
 - lib/kata/setup.rb
 - lib/kata/version.rb
@@ -45,36 +47,33 @@ files:
 - spec/spec_helper.rb
 - spec/support/helpers/stdout_helper.rb
 - spec/support/matchers/kata.rb
-- bin/kata
-has_rdoc: true
+- !binary |-
+  YmluL2thdGE=
 homepage: http://github.com/wbailey/kata
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.8.22
 signing_key: 
 specification_version: 3
 summary: A code kata DSL
-test_files: 
+test_files:
 - spec/kata_base_spec.rb
 - spec/kata_setup_spec.rb
 - spec/kata_spec.rb