iCuke 0.6.6 → 0.7.0

data/Gemfile

@@ -6,7 +6,7 @@ gem "nokogiri"
 gem "background_process"
 
 group :development do
-  gem "rspec", "< 2.0.0"
+  gem "rspec", '>= 2'
   gem "jeweler"
   gem "sandbox"
 end

data/Gemfile.lock

@@ -1,31 +1,40 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    background_process (1.2)
+    background_process (1.3)
     builder (3.0.0)
-    crack (0.1.8)
-    cucumber (0.10.2)
+    cucumber (1.1.0)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
-      gherkin (>= 2.3.5)
+      gherkin (~> 2.5.0)
       json (>= 1.4.6)
-      term-ansicolor (>= 1.0.5)
-    diff-lcs (1.1.2)
-    gherkin (2.3.6)
+      term-ansicolor (>= 1.0.6)
+    diff-lcs (1.1.3)
+    gherkin (2.5.1)
       json (>= 1.4.6)
     git (1.2.5)
-    httparty (0.7.7)
-      crack (= 0.1.8)
-    jeweler (1.5.2)
-      bundler (~> 1.0.0)
+    httparty (0.8.1)
+      multi_json
+      multi_xml
+    jeweler (1.6.4)
+      bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    json (1.5.1)
-    nokogiri (1.4.4)
-    rake (0.8.7)
-    rspec (1.3.2)
+    json (1.6.1)
+    multi_json (1.0.3)
+    multi_xml (0.4.1)
+    nokogiri (1.5.0)
+    rake (0.9.2)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.6.0)
     sandbox (0.1.1)
-    term-ansicolor (1.0.5)
+    term-ansicolor (1.0.6)
 
 PLATFORMS
   ruby
@@ -37,5 +46,5 @@ DEPENDENCIES
   jeweler
   nokogiri
   rake
-  rspec (< 2.0.0)
+  rspec (>= 2)
   sandbox

data/README.markdown

@@ -22,8 +22,6 @@ Write some scenarios like:
       When I tap "About"
       Then I should see "Author:"
 
-The cucumber steps provided by iCuke are documented [here](http://eraserhead.net/icuke/rdoc/files/lib/icuke_world_rb.html).
-
 How it works
 ------------
 

data/Rakefile

@@ -14,11 +14,11 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "iCuke"
-    gem.summary = %Q{Cucumber support for iPhone applications}
-    gem.description = %Q{Cucumber support for iPhone applications}
+    gem.summary = %Q{Cucumber support for iOS applications}
+    gem.description = %Q{Cucumber support for iOS applications}
     gem.email = "jason.felice@bluefroggaming.com"
     gem.homepage = "http://github.com/BlueFrogGaming/iCuke"
-    gem.authors = ["Rob Holland"]
+    gem.authors = ["Jason Felice"]
     gem.add_dependency "cucumber", ">= 0"
     gem.add_dependency "httparty", ">= 0"
     gem.add_dependency "nokogiri", ">= 0"
@@ -60,12 +60,10 @@ rescue LoadError
 end
 
 begin
-  require 'spec/rake/spectask'
+  require 'rspec/core/rake_task'
 
   desc "Run all examples"
-  Spec::Rake::SpecTask.new(:spec) do |t|
-    t.spec_files = FileList['spec/**/*.rb']
-  end
+  RSpec::Core::RakeTask.new(:spec)
 rescue LoadError
   desc "Run all examples (not available)"
   task :spec do
@@ -74,13 +72,3 @@ rescue LoadError
 end
 
 task :default => [:spec, :features]
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "iCuke #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/VERSION

@@ -1 +1 @@
-0.6.6
+0.7.0

data/features/starting_project.feature

@@ -12,6 +12,7 @@ Feature: Starting a new project
       gem "iCuke", :git => "$CURRENT_REPO", :ref => "$CURRENT_REF"
       gem "rake"
       """
+    And I run "gem install bundle"
     And I run "bundle install --path=./path"
     And I run "bundle exec icuke ."
     When I run "bundle exec cucumber"

data/features/step_definitions/shell.rb

@@ -3,6 +3,8 @@ require 'rake'
 require 'sandbox'
 require 'shellwords'
 
+World(Rake::DSL)
+
 Given /^I am in a sandbox directory$/ do
   @environment = Environment.new
   @environment.unbundlerize!

data/iCuke.gemspec

@@ -5,15 +5,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{iCuke}
-  s.version = "0.6.6"
+  s.version = "0.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Rob Holland"]
-  s.date = %q{2011-08-21}
-  s.description = %q{Cucumber support for iPhone applications}
+  s.authors = [%q{Jason Felice}]
+  s.date = %q{2011-10-07}
+  s.description = %q{Cucumber support for iOS applications}
   s.email = %q{jason.felice@bluefroggaming.com}
-  s.executables = ["icuke-module", "icuke", ".gitignore"]
-  s.extensions = ["ext/Rakefile"]
+  s.executables = [%q{.gitignore}, %q{icuke}, %q{icuke-module}]
+  s.extensions = [%q{ext/Rakefile}]
   s.extra_rdoc_files = [
     "LICENSE",
     "README.markdown"
@@ -132,20 +132,11 @@ Gem::Specification.new do |s|
     "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/BlueFrogGaming/iCuke}
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Cucumber support for iPhone applications}
-  s.test_files = [
-    "spec/cucumber_spec.rb",
-    "spec/process_spec.rb",
-    "spec/screen_spec.rb",
-    "spec/simulate_spec.rb",
-    "spec/simulator_spec.rb",
-    "spec/spec_helper.rb"
-  ]
+  s.require_paths = [%q{lib}]
+  s.rubygems_version = %q{1.8.5}
+  s.summary = %q{Cucumber support for iOS applications}
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
@@ -154,7 +145,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<httparty>, [">= 0"])
       s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
       s.add_runtime_dependency(%q<background_process>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, ["< 2.0.0"])
+      s.add_development_dependency(%q<rspec>, [">= 2"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<sandbox>, [">= 0"])
       s.add_runtime_dependency(%q<cucumber>, [">= 0"])
@@ -168,7 +159,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<httparty>, [">= 0"])
       s.add_dependency(%q<nokogiri>, [">= 0"])
       s.add_dependency(%q<background_process>, [">= 0"])
-      s.add_dependency(%q<rspec>, ["< 2.0.0"])
+      s.add_dependency(%q<rspec>, [">= 2"])
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<sandbox>, [">= 0"])
       s.add_dependency(%q<cucumber>, [">= 0"])
@@ -183,7 +174,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<httparty>, [">= 0"])
     s.add_dependency(%q<nokogiri>, [">= 0"])
     s.add_dependency(%q<background_process>, [">= 0"])
-    s.add_dependency(%q<rspec>, ["< 2.0.0"])
+    s.add_dependency(%q<rspec>, [">= 2"])
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<sandbox>, [">= 0"])
     s.add_dependency(%q<cucumber>, [">= 0"])

data/spec/cucumber_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 require 'icuke'
 require 'cucumber/step_mother'
 require 'icuke/cucumber'

data/spec/process_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 require 'icuke/waxsim'
 
 describe ICuke::Simulator::Process do

data/spec/screen_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 require 'icuke/screen'
 
 describe Screen do

data/spec/simulate_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 require 'icuke'
 require 'icuke/simulate'
 
@@ -32,8 +32,8 @@ describe ICuke::Simulate::Gestures::Tap do
 
   it "should generate a down and up touch" do
     tap = ICuke::Simulate::Gestures::Tap.new(20, 30)
-    tap.to_json.should include touch_output(1, 20, 30)
-    tap.to_json.should include touch_output(6, 20, 30)
+    tap.should include_touch(1, 20, 30)
+    tap.should include_touch(6, 20, 30)
   end
 
 end
@@ -45,13 +45,13 @@ describe ICuke::Simulate::Gestures::Swipe do
   end
 
   it "should generate a down and up touch" do
-    @swipe.to_json.should include touch_output(1, 40, 60)
-    @swipe.to_json.should include touch_output(6, 20, 30)
+    @swipe.should include_touch(1, 40, 60)
+    @swipe.should include_touch(6, 20, 30)
   end
 
   it "should generate move touches" do
     move_x, move_y = calculate_move(40, 60, 20, 30, 1)
-    @swipe.to_json.should include touch_output(2, move_x, move_y)
+    @swipe.should include_touch(2, move_x, move_y)
   end
 
   it "should generate multiple move touches when moving over distance" do
@@ -59,7 +59,7 @@ describe ICuke::Simulate::Gestures::Swipe do
     @swipe = ICuke::Simulate::Gestures::Swipe.new(40, 60, 120, 130, 0.015, {})
     4.times do |i|
       x, y = calculate_move(40, 60, 120, 130, i+1)
-      @swipe.to_json.should include touch_output(2, x, y)
+      @swipe.should include_touch(2, x, y)
     end
   end
 

data/spec/simulator_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 require 'icuke/waxsim'
 
 describe ICuke::Simulator do

data/spec/spec_helper.rb

@@ -7,7 +7,7 @@ $:.unshift(File.dirname(__FILE__))
 begin
   require 'rspec'
   require 'rspec/autorun'
-  Rspec.configure do |c|
+  RSpec.configure do |c|
     c.color_enabled = true
     c.before(:each) do
       ::Term::ANSIColor.coloring = true
@@ -25,6 +25,17 @@ end
 
 require 'cucumber'
 
+RSpec::Matchers.define :include_touch do |type, x, y|
+  match do |what|
+    events = JSON.parse(what.to_json)
+    events = [events] unless events.kind_of?(Array)
+    events.detect do |e|
+      e["Data"]["Type"].to_i == type.to_i &&
+        e["Data"]["Paths"].first["Location"]["X"] == x &&
+        e["Data"]["Paths"].first["Location"]["Y"] == y
+    end
+  end
+end
 
 def calculate_move(x1, y1, x2, y2, step_num)
   dx = x2 - x1
@@ -34,16 +45,6 @@ def calculate_move(x1, y1, x2, y2, step_num)
   return 40 + step_num * step * dx, 60 + step_num * step * dy
 end
 
-def touch_output(type, x, y)
-  '{"Data":{"Paths":[{"Size":{"X":1.0,"Y":1.0},"Location":{"X":' +
-    x.to_s +
-    ',"Y":' +
-    y.to_s +
-    '}}],"Delta":{"X":1,"Y":1},"Type":' +
-    type.to_s +
-    '}'
-end
-
 def timestamps(json)
   segments = json.split('"Time":')
   segments.delete_at 0

metadata

@@ -1,213 +1,166 @@
 --- !ruby/object:Gem::Specification 
 name: iCuke
 version: !ruby/object:Gem::Version 
-  hash: 11
-  prerelease: false
-  segments: 
-  - 0
-  - 6
-  - 6
-  version: 0.6.6
+  prerelease: 
+  version: 0.7.0
 platform: ruby
 authors: 
-- Rob Holland
+- Jason Felice
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-08-21 00:00:00 -04:00
-default_executable: 
+date: 2011-10-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: cucumber
-  type: :runtime
-  prerelease: false
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake
   type: :runtime
   prerelease: false
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rake
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
-  name: httparty
   type: :runtime
   prerelease: false
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: httparty
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
   type: :runtime
   prerelease: false
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: nokogiri
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
-  name: background_process
   type: :runtime
   prerelease: false
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: background_process
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  requirement: *id005
+  type: :runtime
+  prerelease: false
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  prerelease: false
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - <
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 0
-        - 0
-        version: 2.0.0
-  requirement: *id006
-- !ruby/object:Gem::Dependency 
-  name: jeweler
+        version: "2"
   type: :development
   prerelease: false
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  requirement: *id007
-- !ruby/object:Gem::Dependency 
-  name: sandbox
   type: :development
   prerelease: false
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: sandbox
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  requirement: *id008
+  type: :development
+  prerelease: false
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: cucumber
-  type: :runtime
-  prerelease: false
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  requirement: *id009
-- !ruby/object:Gem::Dependency 
-  name: httparty
   type: :runtime
   prerelease: false
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: httparty
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  requirement: *id010
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
   type: :runtime
   prerelease: false
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: nokogiri
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  requirement: *id011
-- !ruby/object:Gem::Dependency 
-  name: rake
   type: :runtime
   prerelease: false
-  version_requirements: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
+  name: rake
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  requirement: *id012
-- !ruby/object:Gem::Dependency 
-  name: background_process
   type: :runtime
   prerelease: false
-  version_requirements: &id013 !ruby/object:Gem::Requirement 
+  version_requirements: *id012
+- !ruby/object:Gem::Dependency 
+  name: background_process
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  requirement: *id013
-description: Cucumber support for iPhone applications
+  type: :runtime
+  prerelease: false
+  version_requirements: *id013
+description: Cucumber support for iOS applications
 email: jason.felice@bluefroggaming.com
 executables: 
-- icuke-module
-- icuke
 - .gitignore
+- icuke
+- icuke-module
 extensions: 
 - ext/Rakefile
 extra_rdoc_files: 
@@ -325,7 +278,6 @@ files:
 - spec/simulator_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/BlueFrogGaming/iCuke
 licenses: []
 
@@ -339,7 +291,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 3350866297065875168
       segments: 
       - 0
       version: "0"
@@ -348,21 +300,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
-summary: Cucumber support for iPhone applications
-test_files: 
-- spec/cucumber_spec.rb
-- spec/process_spec.rb
-- spec/screen_spec.rb
-- spec/simulate_spec.rb
-- spec/simulator_spec.rb
-- spec/spec_helper.rb
+summary: Cucumber support for iOS applications
+test_files: []
+