frank-cucumber 0.8.17 → 0.9.0

data/bin/frank

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+
+require 'frank-cucumber/cli'
+
+Frank::CLI.start
+

data/bin/frank-skeleton

@@ -1,9 +1,19 @@
 #!/usr/bin/env ruby
 
-require 'fileutils'
+######################## ######################## ######################## 
+#
+#                             IMPORTANT NOTE
+#
+#     This script is deprecated. it's just here for backwards compatibility.
+#
+#     Users should be using the Frank::CLI-backed `frank` executable
+#
+######################## ######################## ######################## 
+
+require 'frank-cucumber/cli'
+
+Frank::CLI.start
 
-TARGET_DIR = File.join( FileUtils.pwd, "Frank" )
-SOURCE_DIR = File.join( File.dirname(__FILE__), '..', 'frank-skeleton' )
 
 command = ARGV[0]
 
@@ -15,38 +25,9 @@ end
 
 update_mode = ARGV[0] == 'update-server'
 
-def create_skeleton_dir
-  puts "I'm about to create a subdirectory called Frank which will contain the Frank server files and also your Cucumber tests. Please hit return to confirm that's what you want."
-  exit 3 unless STDIN.gets.chomp == ''
-
-  FileUtils.mkdir_p( TARGET_DIR )
-  FileUtils.cp_r( Dir.glob( SOURCE_DIR+"/*" ), TARGET_DIR )
-
-  puts <<-EOS
-  Frank subdirectory created.
-  Your next step is to create a Frankified target for your app, and add the libFrank.a, libShelley.a and frank_static_resources.bundle files inside the Frank directory to that target.
-  After that, you can build the target and try executing 'cucumber' from the Frank directory to see how your initial cucumber test runs.
-  EOS
-end
-
-def update_server_files
-  source_files = %w{libFrank.a libShelley.a frank_static_resources.bundle}.map{ |x| File.join( SOURCE_DIR, x ) }
-  FileUtils.cp_r( source_files, TARGET_DIR )
-  puts "All done. I've updated libFrank.a, libShelley.a and frank_static_resources.bundle inside #{TARGET_DIR}"
-end
-
-frank_dir_already_exists = File.exists?( TARGET_DIR ) 
-
-if frank_dir_already_exists && !update_mode
-  puts "A Frank subdirectory already exists. I don't want to mess with that. \n\nIf you want me to update the frank server code in that directory then run `frank-skeleton update-server`"
-  exit 1
-elsif !frank_dir_already_exists && update_mode
-  puts "There isn't a Frank subdirectory here for me to update.\n\nIf you want to create a new Frank subdirectory containing the Frank server code and an initial Cucumber setup then you should run `frank-skeleton` with no arguments"
-  exit 2
-end
-
+cli = Frank::CLI.new
 if update_mode
-  update_server_files
+  cli.update
 else
-  create_skeleton_dir
+  cli.skeleton
 end

data/frank-cucumber.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
   s.add_dependency( "plist" )
   s.add_dependency( "json" ) # TODO: figure out how to be more permissive as to which JSON gems we allow
   s.add_dependency( "dnssd" )
+  s.add_dependency( "thor" )
 
   s.add_development_dependency( "rr" )
 end

data/frank-skeleton/frankify.xcconfig

@@ -0,0 +1,3 @@
+INSTALL_PATH = /./
+
+OTHER_LDFLAGS = $(inherited) -all_load -ObjC -framework CFNetwork -lShelley -lFrank -L Frank

data/lib/frank-cucumber/cli.rb

@@ -0,0 +1,105 @@
+require 'thor'
+require 'frank-cucumber/launcher'
+
+module Frank
+  class CLI < Thor
+    include Thor::Actions
+
+    def self.source_root
+      File.join( File.dirname(__FILE__), '..','..','frank-skeleton' )
+    end
+
+    # included just because the old setup script was called frank-skeleton
+    desc "skeleton", "an alias for setup"
+    def skeleton
+      invoke :setup
+    end
+
+    desc "setup", "set up your iOS app by adding a Frank subdirectory containing everything Frank needs"
+    def setup
+      directory ".", "Frank"
+      say <<-EOS
+
+      Frank subdirectory created.
+      Your next step is to create a Frankified target for your app, and add the libFrank.a, libShelley.a and frank_static_resources.bundle files inside the Frank directory to that target.
+      After that, you can build the target and try executing 'cucumber' from the Frank directory to see how your initial cucumber test runs.
+      EOS
+    end
+
+    desc "update", "updates the frank server components inside your Frank directory"
+    long_desc "This updates the parts of Frank that are embedded inside your app (e.g. libFrank.a and frank_static_resources.bundle)"
+    def update
+      %w{libFrank.a libShelley.a}.each do |f|
+        copy_file f, File.join( 'Frank', f ), :force => true
+      end
+      directory( 'frank_static_resources.bundle', 'Frank/frank_static_resources.bundle', :force => true )
+    end
+
+    desc "build", "builds a Frankified version of your native app"
+    def build
+
+      in_root do
+        unless File.directory? 'Frank'
+          if yes? "You don't appear to have set up a Frank directory for this project. Would you like me to set that up now? Type 'y' or 'yes' if so."
+            invoke :skeleton
+          else
+            say "OK, in that case there's not much I can do for now. Whenever you change your mind and want to get your project setup with Frank simply run `frank setup` from the root of your project directory."
+            say "Bye bye for now!"
+            exit 11
+          end
+        end
+      end
+
+      static_bundle = 'frank_static_resources.bundle'
+
+      remove_dir build_output_dir
+
+      run "xcodebuild -xcconfig Frank/frankify.xcconfig install -configuration Debug -sdk iphonesimulator DSTROOT=#{build_output_dir} WRAPPER_NAME=#{app_bundle_name}"
+
+      in_root do
+        FileUtils.cp_r( 
+          File.join( 'Frank',static_bundle),
+          File.join( frankified_app_dir, static_bundle ) 
+        )
+      end
+    end
+
+    desc "build_and_launch", "rebuild a Frankfied version of your app then launch"
+    def build_and_launch
+      invoke :build
+      invoke :launch
+    end
+
+    desc "launch", "open the Frankified app in the simulator"
+    def launch
+      in_root do
+        unless File.exists? frankified_app_dir
+          say "A Frankified version of the app doesn't appear to have been built. Building one now"
+          say "..."
+          invoke :build
+        end
+
+        say "LAUNCHING IN THE SIMULATOR..."
+
+        launcher = SimLauncher::DirectClient.new(frankified_app_dir, nil, nil )
+        launcher.relaunch
+      end
+    end
+
+    private
+
+    def app_bundle_name
+      "Frankified.app"
+    end
+
+    def build_output_dir
+      "Frank/frankified_build"
+    end
+
+    def frankified_app_dir
+      File.join( build_output_dir, app_bundle_name )
+    end
+
+  end
+end
+

data/lib/frank-cucumber/frank_helper.rb

@@ -114,7 +114,7 @@ module FrankHelper
   end
 
   def app_exec(method_name, *method_args)
-    operation_map = Gateway.build_operation_map(method_name,method_args)
+    operation_map = Gateway.build_operation_map(method_name.to_s, method_args)
     
     res = frank_server.send_post( 
       'app_exec', 
@@ -125,7 +125,7 @@ module FrankHelper
   end
 
   def frankly_map( query, method_name, *method_args )
-    operation_map = Gateway.build_operation_map(method_name,method_args)
+    operation_map = Gateway.build_operation_map(method_name.to_s, method_args)
 
     res = frank_server.send_post( 
       'map',

data/lib/frank-cucumber/version.rb

@@ -1,5 +1,5 @@
 module Frank
   module Cucumber
-    VERSION = "0.8.17"
+    VERSION = "0.9.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: frank-cucumber
 version: !ruby/object:Gem::Version
-  version: 0.8.17
+  version: 0.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-08 00:00:00.000000000Z
+date: 2012-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70224556806200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70224556806200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70224556804840 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +38,15 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70224556804840
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: sim_launcher
-  requirement: &70224556803920 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +54,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70224556803920
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70224556803260 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +70,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70224556803260
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: plist
-  requirement: &70224556802780 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +86,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70224556802780
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70224556802040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +102,31 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70224556802040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: dnssd
-  requirement: &70224556801380 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +134,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70224556801380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &70224556800900 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,11 +150,17 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70224556800900
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Use cucumber to test native iOS apps via Frank
 email:
 - gems@thepete.net
 executables:
+- frank
 - frank-skeleton
 extensions: []
 extra_rdoc_files: []
@@ -111,6 +168,7 @@ files:
 - .gitignore
 - Gemfile
 - Rakefile
+- bin/frank
 - bin/frank-skeleton
 - frank-cucumber.gemspec
 - frank-skeleton/features/my_first.feature
@@ -145,11 +203,13 @@ files:
 - frank-skeleton/frank_static_resources.bundle/symbiote.css
 - frank-skeleton/frank_static_resources.bundle/symbiote.js
 - frank-skeleton/frank_static_resources.bundle/underscore.js
+- frank-skeleton/frankify.xcconfig
 - frank-skeleton/libFrank.a
 - frank-skeleton/libShelley.a
 - lib/frank-cucumber.rb
 - lib/frank-cucumber/app_bundle_locator.rb
 - lib/frank-cucumber/bonjour.rb
+- lib/frank-cucumber/cli.rb
 - lib/frank-cucumber/color_helper.rb
 - lib/frank-cucumber/core_frank_steps.rb
 - lib/frank-cucumber/frank_helper.rb
@@ -184,7 +244,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Use cucumber to test native iOS apps via Frank