kata 1.3.2 → 1.3.3

data/README.md

@@ -1,11 +1,13 @@
 ## Kata
 
 A kata is defined as an exercise in programming which helps hone your skills through practice and
-repetition. Authoring katas is done in blogs but you can't really test yourself. This gem provides a
-DSL to author the kata and administer it as a test providing feedback for evaluation.  It also
-provides basic github repo setup so that you can chart solution progress over time.
-
-The inspiration for this gem came from my friend [Nick Hengeveld](https://github.com/nickh)
+repetition. Authoring katas is done in blogs but you can't really test yourself. 
+[coderdojo](http://www.coderdojo.com) is a fine website and provides a great way to get involved
+with katas.  The purpose of this gem is to provide a work environment based way of interacting.
+It provides several facilities for authoring and taking katas that allow you to work in your own
+environment. The inspiration for this gem came from my friend [Nick
+Hengeveld](https://github.com/nickh) who first introduced me to the concept of a kata several years
+ago.
 
 ### Installation
 
@@ -27,7 +29,7 @@ or do it the old fashioned way and install the gem manually:
 
     DESCRIPTION
         The kata gem allows one to manage their personal development in the
-        practice of writing code through repitition.
+        practice of writing code through repetition.
 
     PRIMARY COMMANDS
         kata setup [--no-repo] [--language=option] file
@@ -64,7 +66,7 @@ The [Wiki](https://github.com/wbailey/kata/wiki) has all of the documentation ne
 
 ### License
 
-Copyright (c) 2011-2013 Wes Bailey
+Copyright (c) 2011-2014 Wes Bailey
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
 associated documentation files (the "Software"), to deal in the Software without restriction,

data/bin/kata

@@ -13,7 +13,7 @@ SYNOPSIS
 
 DESCRIPTION
     The kata gem allows one to manage their personal development in the
-    practice of writing code through repitition.
+    practice of writing code through repetition.
 
 PRIMARY COMMANDS
     kata setup [--no-repo] [--language=option] file
@@ -68,7 +68,7 @@ case options.action
     name = nil
 
     File.open(options.file).each do |line|
-      if line.match /^kata *\"([^\"]*)\" *do$/
+      if line.match(/^kata *\"([^\"]*)\" *do$/)
         name = $1
         break
       end

data/lib/kata/base.rb

@@ -53,38 +53,34 @@ module Kata
     end
 
     def complete(status = true)
-      if @@times.size > 0
-        title = status ? 'Congratulations!' : 'You completed the following:'
+      return if @@times.size == 0
 
-        formatter = lambda do |sec| 
-          use = sec.round
-          [use/3600, use/60 % 60, use % 60].map {|v| v.to_s.rjust(2,'0')}.join(':')
-        end
+      formatter = lambda do |sec|
+        use = sec.round
+        [use/3600, use/60 % 60, use % 60].map {|v| v.to_s.rjust(2,'0')}.join(':')
+      end
 
-        suppress_output
+      suppress_output
 
-        table :border => true do
-          row :header => true do
-            column 'Requirement', :color => 'red', :width => 80
-            column 'Time', :color => 'red', :width => 8
-          end
+      table :border => true do
+        row :header => true do
+          column 'Requirement', :color => 'red', :width => 80
+          column 'Time', :color => 'red', :width => 8
+        end
 
-          @@times.each do |t|
-            row do
-              column t[:title]
-              column formatter.call(t[:time])
-            end
+        @@times.each do |t|
+          row do
+            column t[:title]
+            column formatter.call(t[:time])
           end
         end
+      end
 
-        report = capture_output
-
-        File.open('report.txt', 'w').write( report )
+      report = capture_output
 
-        puts report
-      end
+      File.open('report.txt', 'w').write( report )
 
-      exit 1 unless status
+      puts report
     end
 
     def ancestry

data/lib/kata/setup/base.rb

@@ -1,5 +1,7 @@
 require 'fileutils'
 require 'ostruct'
+require 'octokit'
+require 'io/console'
 
 module Kata
   module Setup
@@ -13,64 +15,92 @@ module Kata
       end
 
       def create_repo options
+        create_remote_repo if options.repo
+
+        push_local_repo(options.repo)
+      end
+
+      def repo_name=(kata_name)
+        @repo_name = "#{kata_name.gsub(/( |-)\1?/, '_')}-#{Time.now.strftime('%Y-%m-%d-%H%M%S')}".downcase
+      end
+
+      def build_tree(type = 'ruby')
+        case type
+        when 'ruby'
+          Kata::Setup::Ruby.new(kata_name).build_tree
+        end
+      end
+
+      private
+
+      def github
         # Setup from github configuration
-        raise Exception, 'Git not installed' unless system 'which git > /dev/null'
+        raise Exception, 'Git not installed?  Could not find git using which' unless system('which git > /dev/null')
 
-        github = OpenStruct.new :url => 'http://github.com/api/v2/json/'
+        @github ||=
+          begin
+            tmp = OpenStruct.new
 
-        github_user, shell_user = %x{git config --get github.user}.chomp, ENV['USER']
+            github_user = %x{git config --get github.user}.chomp
+            shell_user = ENV['USER']
 
-        github.user = github_user.empty? ? shell_user : github_user
+            tmp.user = github_user.empty? ? shell_user : github_user
 
-        raise Exception, 'Unable to determine github user' if github.user.empty?
+            raise Exception, 'Unable to determine github user' if tmp.user.empty?
 
-        github.token = %x{git config --get github.token}.chomp
+            print 'Github account password: '
+            tmp.password = STDIN.noecho(&:gets).chomp
 
-        raise Exception, 'Unable to determine github api token' if github.token.empty?
+            tmp
+          end
+      end
 
-        user_string = "-u '#{github.user}/token:#{github.token}'"
-        repo_params = "-d 'name=#{repo_name}' -d 'description=code+kata+repo'"
+      def client
+        @client ||= Octokit::Client.new(:login => github.user, :password => github.password)
+      end
 
-        # Create the repo on github
-        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
+      def create_session_token
+        authorization = client.create_authorization({:scopes => ['public_repo'], :note => 'Ruby Kata'})
 
-        # publish to github
+        github.token = authorization.token
+
+        cmd = "git config --add github.token #{github.token}"
+        raise SystemCallError, 'Unable to cache github api token' unless system(cmd)
+      end
 
-        print 'creating files for repo and initializing...'
+      def create_remote_repo
+        create_session_token
 
-        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;"
+        puts "Creating remote repo..."
+        client.create_repo "#{repo_name}"
+        puts "end"
+      end
+
+      def push_local_repo(new_repo)
+        print "creating files for repo and initializing..."
+
+        cmd = "cd #{repo_name} &&"
+
+        if new_repo
+          cmd << "git init >/dev/null 2>&1 &&"
+          cmd << "git add README .rspec lib/ spec/ >/dev/null 2>&1 &&"
         else
-          cmd << "git add #{ENV['PWD']}/#{repo_name};"
+          cmd << "git add #{ENV['PWD']}/#{repo_name} >/dev/null 2>&1;"
+        end
+
+        cmd << "git commit -m 'starting kata' > /dev/null 2>&1;"
+
+        if new_repo
+          cmd << "git remote add origin git@github.com:#{github.user}/#{repo_name}.git >/dev/null 2>&1 &&"
         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'
+
+        cmd << 'git push origin master'
 
         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
-
-      def repo_name=(kata_name)
-        @repo_name = "#{kata_name.gsub(/( |-)\1?/, '_')}-#{Time.now.strftime('%Y-%m-%d-%H%M%S')}".downcase
-      end
-
-      def build_tree(type = 'ruby')
-        case type
-        when 'ruby'
-          Kata::Setup::Ruby.new(kata_name).build_tree
-        end
-      end
     end
   end
 end

data/lib/kata/version.rb

@@ -1,3 +1,3 @@
 module Kata
-  VERSION = '1.3.2'
+  VERSION = '1.3.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kata
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-09 00:00:00.000000000 Z
+date: 2014-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2156425380 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,15 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2156425380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: command_line_reporter
-  requirement: &2156424600 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,7 +38,12 @@ dependencies:
         version: 3.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *2156424600
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.1
 description: This DSL provides an easy way for you to write a code kata for pairing
   exercises or individual testing
 email: baywes@gmail.com
@@ -54,8 +64,7 @@ files:
 - spec/spec_helper.rb
 - spec/support/helpers/stdout_helper.rb
 - spec/support/matchers/kata.rb
-- !binary |-
-  YmluL2thdGE=
+- bin/kata
 homepage: http://github.com/wbailey/kata
 licenses: []
 post_install_message: 
@@ -68,6 +77,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2352903460502696782
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -76,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: A code kata DSL