Hokkaido 0.0.2 → 0.0.3

data/.gitignore

@@ -1,3 +1,4 @@
+.DS_Store
 *.gem
 *.rbc
 .bundle

data/.gitmodules

@@ -0,0 +1,6 @@
+[submodule "cucumber"]
+	path = cucumber
+	url = git@github.com:jsilverMDX/cucumber.git
+[submodule "gherkin"]
+	path = gherkin
+	url = git@github.com:jsilverMDX/gherkin.git

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    Hokkaido (0.0.1)
+    Hokkaido (0.0.2)
       commander
       ruby_parser
 

data/README.md

@@ -39,29 +39,19 @@ Where impossible or strange, A `FIXME` is produced. (not desirable but useful)
 
 The above may be expanded later.
 
-## Installation
-
-Add this line to your application's Gemfile:
-
-    gem 'Hokkaido'
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install Hokkaido
-
 ## Usage
 
-`[bundle exec] Hokkaido <gem_name> <init_file> <lib_folder>`
+Porting: `[bundle exec] Hokkaido port <gem_name> <init_file> <lib_folder>`
+Testing: `[bundle exec] Hokkaido test <gem_name> <init_file> <lib_folder>`
+
+Note, `init_file` is looked for within `lib_folder`
 
-## Examples
+## Example
 
-Hokkaido term ansicolor.rb term/lib
-Hokkaido cucumber cucumber.rb cucumber/lib
-Hokkaido gherkin gherkin.rb gherkin/lib
+Hokkaido port gherkin gherkin.rb gherkin-test/lib
+Hokkaido port term ansicolor.rb term/lib
+Hokkaido port cucumber cucumber.rb cucumber/lib
+Hokkaido port gherkin gherkin.rb gherkin/lib
 
 ## Contributing
 

data/bin/Hokkaido

@@ -8,15 +8,18 @@ program :version, '0.0.1'
 program :description, 'Gem port tool for RubyMotion'
 
 command :port do |c|
-  c.syntax = "Usage: Hokkaido port <gem_name> <init_file> <lib_dir>"
+  c.syntax = "Usage: Hokkaido port <gem_name> <init_filename> <lib_dir>"
   c.description = 'Attempts to port the gem. This will modify the files!'
   c.option '--sim', TrueClass, 'Does not edit the gem files. Good for hacking Hokkaido'
   c.action do |args, options|
-    if File.exists?(args[1]) && File.directory?(args[2]) && args[0].size > 1
+    if Hokkaido.valid_input?(args)
       puts "Init Lib:".colorize(:blue)+" #{args[1]}"
       puts "Gem name:".colorize(:blue)+" #{args[0]}"
       say "Lib folder:".colorize(:blue)+" #{args[2]}"
       port = Hokkaido::Port.new(args, options)
+      port.modify
+      say "Gem modification complete. It will now be tested.".colorize(:yellow)
+      say Hokkaido.self_test_result(port)
     else
       say "I can't process that."
     end
@@ -24,11 +27,11 @@ command :port do |c|
 end
 
 command :test do |c|
-  c.syntax = "Usage: Hokkaido test <init_file>"
-  c.description = 'Attempts to test the gem with a mocked RubyMotion.'
+  c.syntax = "Usage: Hokkaido port <gem_name> <lib_dir> <init_filename> "
+  c.description = 'Test a gem with a mocked RubyMotion to see if it passes.'
   c.action do |args, options|
     if args[0] && File.exists?(args[0])
-      Hokkaido::Port.test(args[0])
+      say Hokkaido.self_test_result(Hokkaido::Port.new(args, options))
     else
       say "File not found."
     end

data/lib/Hokkaido.rb

@@ -1,9 +1,6 @@
 require "Hokkaido/version"
 require 'gem_modifier'
 require 'term/ansicolor'
-require 'pry'
-
-
 
 module Hokkaido
 
@@ -19,26 +16,32 @@ module Hokkaido
 
     def initialize(info, options=nil)
       @mod_gem = GemModifier.new(info)
-      # if options.sim
-      #   @mod_gem.simulate!
-      # else
+    end
+
+    def modify
       @mod_gem.modify!
-      puts "Gem modification complete. It will now be tested.".colorize(:yellow)
-      self.test
-      # end
     end
 
     def test
       true_path = File.join(@mod_gem.lib_folder, @mod_gem.init_lib)
       mocklib = File.expand_path('lib/motion_mock.rb')
-      retval = system("/usr/bin/env ruby -r #{mocklib} #{true_path}")
-      if retval
-        puts "The #require removal was successful.".colorize(:green)
-      else
-        puts "The #require removal has failed.".colorize(:red)
-      end
-      return retval
+      system("/usr/bin/env ruby -r #{mocklib} #{true_path}")
     end
   end
 
+  def self.self_test_result(port)
+    if port.test
+      puts "The #require removal was successful.".colorize(:green)
+    else
+      puts "The #require removal has failed.".colorize(:red)
+    end
+  end
+
+  def self.valid_input?(args)
+    if args.length == 3 && args[0].length > 0
+      name, init_filename, lib_dir = args
+      init_path = File.join(lib_dir, init_filename)
+      File.directory?(lib_dir) && File.exists?(init_path)
+    end
+  end
 end

data/lib/Hokkaido/version.rb

@@ -1,3 +1,3 @@
 module Hokkaido
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/motion_mock.rb

@@ -1,6 +1,12 @@
 require 'rubygems'
 require 'pry'
 
+# module Kernel
+#   def eval(foo)
+#     raise "RubyMotion can't #eval"
+#   end
+# end
+
 module Motion
   FILES = []
   module Project

data/spec/Hokkaido/gem_modifier_spec.rb

@@ -1,12 +1,11 @@
 require 'spec_helper'
 
 describe Hokkaido::GemModifier do
-  # it "sets up the 3 required input variables" do
-  #   info = ["cucumber", "cucumber/lib/cucumber.rb", "cucumber/lib"]
-  #   modifier = Hokkaido::GemModifier.new(info)
-  #   modifier.gem_name.should == "cucumber"
-  #   modifier.init_lib.should == "./cucumber/lib/cucumber.rb"
-  #   modifier.lib_folder.should == "cucumber/lib"
-  # end
-
+  it "sets up the 3 required input variables" do
+    info = ["cucumber", "cucumber/lib/cucumber.rb", "cucumber/lib"]
+    modifier = Hokkaido::GemModifier.new(info)
+    modifier.gem_name.should == "cucumber"
+    modifier.init_lib.should == "cucumber/lib/cucumber.rb"
+    modifier.lib_folder.should == "cucumber/lib"
+  end
 end

data/spec/Hokkaido/port_spec.rb

@@ -1,14 +1,19 @@
 require 'spec_helper'
 
-
-
 describe Hokkaido::Port do
-  it "is a factory" do
-    Hokkaido::Port.should respond_to(:new)
+  before do
+    File.directory?("gherkin").should be_true
+    FileUtils.cp_r "gherkin", "gherkin-spec"
+    @info = ["gherkin-spec", "gherkin.rb", "gherkin-spec/lib"]
   end
-
-  it "should attempt to port a gem to RubyMotion" do
-    port = Hokkaido::Port.new(["gherkin", "gherkin.rb", "gherkin/lib"])
+  
+  it "should pass self test" do
+    port = Hokkaido::Port.new(@info)
+    port.modify
     port.test.should be_true
   end
+
+  after do
+    FileUtils.rmtree 'gherkin-spec'
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: Hokkaido
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -133,8 +133,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .DS_Store
 - .gitignore
+- .gitmodules
 - .rvmrc
 - Gemfile
 - Gemfile.lock