frank-cucumber 1.1.9.pre1 → 1.1.10

data/frank-cucumber.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
   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_dependency( "xcodeproj" )
+  s.add_dependency( "xcodeproj", [">=0.5.3"] )
 
   s.add_development_dependency( "rr" )
   s.add_development_dependency( "yard" )

data/frank-skeleton/frank_static_resources.bundle/js/controller.js

@@ -1,22 +1,9 @@
 (function() {
-  var RELOAD_INTERVAL, guessAtDeviceFamilyBasedOnViewDump,
+  var RELOAD_INTERVAL,
     __slice = [].slice;
 
   RELOAD_INTERVAL = 500;
 
-  guessAtDeviceFamilyBasedOnViewDump = function(viewHier) {
-    switch (viewHier.accessibilityFrame.size.height) {
-      case 1024:
-        return 'ipad';
-      case 480:
-      case 568:
-        return 'iphone';
-      default:
-        console.warn("couldn't recognize device family based on screen height of " + viewHeir.accessibilityFrame.size.height + "px");
-        return 'unknown';
-    }
-  };
-
   define(['frank'], function(frank) {
     var createController;
     createController = function(_arg) {
@@ -117,12 +104,14 @@
       reload = function() {
         var deferable;
         deferable = $.Deferred();
-        $.when(frank.fetchViewHierarchy(), frank.fetchOrientation()).done(function(_arg1, orientation) {
-          var accessibleViews, deviceFamily, rawHier;
+        $.when(frank.fetchViewHierarchy(), frank.fetchResolution(), frank.fetchOrientation(), frank.fetchDevice()).done(function(_arg1, resolution, orientation, deviceFamily) {
+          var accessibleViews, rawHier;
           rawHier = _arg1[0];
-          deviceFamily = guessAtDeviceFamilyBasedOnViewDump(rawHier);
+          if (deviceFamily == 'mac') {
+            $liveButton.hide();
+          }
           treeView.model.resetViewHier(rawHier);
-          ersatzView.model.resetViews(treeView.model.get('allViews'), deviceFamily, orientation);
+          ersatzView.model.resetViews(treeView.model.get('allViews'), resolution, deviceFamily, orientation);
           accessibleViews = treeView.model.getAccessibleViews();
           accessibleViewsView.collection.reset(accessibleViews);
           ersatzView.render();

data/frank-skeleton/frank_static_resources.bundle/js/ersatz_model.js

@@ -15,8 +15,9 @@
           return _this.temporaryHighlightTimeout = void 0;
         }, 1500);
       },
-      resetViews: function(views, deviceFamily, orientation) {
+      resetViews: function(views, resolution, deviceFamily, orientation) {
         this.set('allViews', views);
+        this.set('resolution', resolution);
         this.set('deviceFamily', deviceFamily);
         this.set('orientation', orientation);
         this.set('highlightFrames', []);

data/frank-skeleton/frank_static_resources.bundle/js/ersatz_view.js

@@ -1,5 +1,5 @@
 (function() {
-  var ISO_MAJOR_OFFSET, ISO_MINOR_OFFSET, ISO_SKEW, SCREEN_BOUNDS,
+  var ISO_MAJOR_OFFSET, ISO_MINOR_OFFSET, ISO_SKEW,
     __slice = [].slice;
 
   ISO_SKEW = 15;
@@ -8,35 +8,29 @@
 
   ISO_MINOR_OFFSET = 5;
 
-  SCREEN_BOUNDS = {
-    iphone: {
-      x: 0,
-      y: 0,
-      width: 320,
-      height: 480
-    },
-    ipad: {
-      x: 0,
-      y: 0,
-      width: 768,
-      height: 1024
-    }
-  };
-
   define(['transform_stack', 'ersatz_model'], function(transformStack, ErsatzModel) {
     var ErsatzView, ErsatzViewSnapshotView, drawStaticBackdropAndReturnTransformer, transformFromBaseForViewModel;
-    drawStaticBackdropAndReturnTransformer = function(paper, deviceFamily, orientation, isoSkew) {
-      var isiPhone, rotation, rotationPoint, transformer;
+    drawStaticBackdropAndReturnTransformer = function(paper, resolution, deviceFamily, orientation, isoSkew) {
+      var isiPhone, isiPad, rotation, rotationPoint, transformer;
       paper.clear();
       paper.canvas.setAttribute("width", "100%");
       paper.canvas.setAttribute("height", "100%");
       isiPhone = 'iphone' === deviceFamily;
+      isiPad = 'ipad' == deviceFamily;
       if (isiPhone) {
-        paper.canvas.setAttribute("viewBox", "0 0 380 720");
-        rotationPoint = [190, 360];
-      } else {
-        paper.canvas.setAttribute("viewBox", "0 0 875 1200");
-        rotationPoint = [437, 600];
+        width = resolution.width + 60;
+        height = resolution.height + 240;
+        paper.canvas.setAttribute("viewBox", "0 0 " + width + " " + height);
+        rotationPoint = [width / 2, height / 2];
+      } else if (isiPad) {
+        width = resolution.width + 108;
+        height = resolution.height + 176;
+        paper.canvas.setAttribute("viewBox", "0 0 " + width + " " + height);
+        rotationPoint = [width / 2, height / 2];
+      }
+      else
+      {
+        paper.canvas.setAttribute("viewBox", "0 0 " + resolution.width + " " +  resolution.height);
       }
       transformer = transformStack();
       transformer.skew(0, isoSkew).translate(6, 6);
@@ -56,29 +50,36 @@
         transformer.rotateAroundPoint.apply(transformer, [rotation].concat(__slice.call(rotationPoint)));
       }
       if (isiPhone) {
-        paper.rect(0, 0, 360, 708, 40).attr({
+        width = resolution.width + 40;
+        height = resolution.height + 228;
+        paper.rect(0, 0, width, height, 40).attr({
           fill: "black",
           stroke: "gray",
           "stroke-width": 4
         }).transform(transformer.desc());
-      } else {
-        paper.rect(10, 10, 855, 1110, 20).attr({
+      } else if (isiPad) {
+        width = resolution.width + 108;
+        height = resolution.height + 86;
+        paper.rect(10, 10, width, height, 20).attr({
           'fill': 'black',
           'stroke': 'gray',
           'stroke-width': 6
         }).transform(transformer.desc());
       }
       if (isiPhone) {
-        transformer.push().translate(180, 655);
+        x = resolution.width / 2 + 20;
+        y = resolution.height + 175;
+        transformer.push().translate(x, y);
         paper.circle(0, 0, 34).transform(transformer.desc()).attr("fill", "90-#303030-#101010");
         paper.rect(0, 0, 22, 22, 5).attr({
           stroke: "gray",
           "stroke-width": 2
         }).transform(transformer.push().translate(-11, -11).descAndPop());
         transformer.translate(20, 120);
-      } else {
+      } else if (isiPad) {
         transformer.translate(50, 50);
       }
+
       if (isoSkew > 0) {
         transformer.translate(-ISO_MAJOR_OFFSET, 0);
       }
@@ -137,7 +138,7 @@
         var isoSkew;
         this.highlights = [];
         isoSkew = (this.model.get('isAsploded') ? ISO_SKEW : 0);
-        this.backdropTransformer = drawStaticBackdropAndReturnTransformer(this.paper, this.model.get('deviceFamily'), this.model.get('orientation'), isoSkew);
+        this.backdropTransformer = drawStaticBackdropAndReturnTransformer(this.paper, this.model.get('resolution'), this.model.get('deviceFamily'), this.model.get('orientation'), isoSkew);
         this.backdrop = this.paper.image();
         this.refreshBaseScreenshot();
         if (this.model.get('isAsploded')) {
@@ -147,7 +148,13 @@
         return this.el;
       },
       screenBounds: function() {
-        return SCREEN_BOUNDS[this.model.get('deviceFamily')];
+        resolution = this.model.get('resolution');
+        return {
+          x: 0,
+          y: 0,
+          width: resolution.width,
+          height: resolution.height
+        };
       },
       refreshBaseScreenshot: function() {
         var newScreenshotUrl;

data/frank-skeleton/frank_static_resources.bundle/js/frank.js

@@ -1,5 +1,5 @@
 (function() {
-  var baseUrlFor, cacheBust, displayErrorResponse, fetchOrientation, fetchViewHierarchy, isErrorResponse, requestSnapshotRefresh, sendMapRequest;
+  var baseUrlFor, cacheBust, displayErrorResponse, fetchResolution, fetchOrientation, fetchViewHierarchy, fetchDevice, isErrorResponse, requestSnapshotRefresh, sendMapRequest;
 
   cacheBust = function(url) {
     return "" + url + "?" + ((new Date()).getTime());
@@ -26,6 +26,19 @@
     });
   };
 
+  fetchResolution = function() {
+    var deferable, request;
+    deferable = new $.Deferred();
+    request = $.ajax({
+      type: "GET",
+      dataType: "json",
+      url: baseUrlFor("/resolution")
+    }).done(function(response) {
+      return deferable.resolve(response || 'unknown');
+    }).fail(deferable.reject);
+    return deferable.promise();
+  };
+
   fetchOrientation = function() {
     var deferable, request;
     deferable = new $.Deferred();
@@ -39,6 +52,19 @@
     return deferable.promise();
   };
 
+  fetchDevice = function() {
+    var deferable, request;
+    deferable = new $.Deferred();
+    request = $.ajax({
+      type: "GET",
+      dataType: "json",
+      url: baseUrlFor("/device")
+    }).done(function(response) {
+      return deferable.resolve(response && response.device || 'unknown');
+    }).fail(deferable.reject);
+    return deferable.promise();
+  };
+
   requestSnapshotRefresh = function() {
     return $.ajax({
       type: 'GET',
@@ -83,7 +109,9 @@
   define(function() {
     return {
       fetchViewHierarchy: fetchViewHierarchy,
+      fetchResolution: fetchResolution,
       fetchOrientation: fetchOrientation,
+      fetchDevice: fetchDevice,
       requestSnapshotRefresh: requestSnapshotRefresh,
       baseScreenshotUrl: function() {
         return cacheBust(baseUrlFor('/screenshot'));

data/lib/frank-cucumber/cli.rb

@@ -8,6 +8,7 @@ require 'frank-cucumber/launcher'
 require 'frank-cucumber/console'
 require 'frank-cucumber/frankifier'
 require 'frank-cucumber/mac_launcher'
+require 'xcodeproj'
 
 module Frank
   class CLI < Thor
@@ -32,6 +33,7 @@ module Frank
     method_option WITHOUT_LUMBERJACK, :type => :boolean
     method_option :build_configuration, :aliases=>'--conf', :type=>:string, :default => 'Debug'
     method_option :target, :type=>:string
+    method_option :project, :type=>:string
     def setup
       @libs = %w(Shelley CocoaAsyncSocket CocoaLumberjack CocoaHTTPServer Frank)
       @libsMac = %w(CocoaAsyncSocketMac CocoaLumberjackMac CocoaHTTPServerMac FrankMac)
@@ -43,7 +45,7 @@ module Frank
       @libsMac -= %w(CocoaLumberjackMac) if options[WITHOUT_LUMBERJACK]
       directory ".", "Frank"
 
-      Frankifier.frankify!( File.expand_path('.'), :build_config => options[:build_configuration], :target => options[:target] )
+      Frankifier.frankify!( File.expand_path('.'), :build_config => options[:build_configuration], :target => options[:target], :project => options[:project] )
     end
 
     desc "update", "updates the frank server components inside your Frank directory"
@@ -55,13 +57,12 @@ module Frank
       directory( 'frank_static_resources.bundle', 'Frank/frank_static_resources.bundle', :force => true )
     end
 
-    XCODEBUILD_OPTIONS = %w{workspace scheme target configuration}
+    XCODEBUILD_OPTIONS = %w{workspace project scheme target configuration}
     desc "build", "builds a Frankified version of your native app"
     XCODEBUILD_OPTIONS.each do |option|
       method_option option
     end
     method_option 'arch', :type => :string, :default => 'i386'
-    method_option 'mac', :type => :boolean, :default => false
     method_option :noclean, :type => :boolean, :default => false, :aliases => '--nc', :desc => "Don't clean the build directory before building"
     def build
       clean = !options['noclean']
@@ -99,7 +100,9 @@ module Frank
         separate_configuration_option = "-configuration Debug"
       end
 
-      if options['mac']
+      build_mac = determine_build_patform(options) == :osx
+
+      if build_mac
         run %Q|xcodebuild -xcconfig Frank/frankify.xcconfig #{build_steps} #{extra_opts} #{separate_configuration_option} DEPLOYMENT_LOCATION=YES DSTROOT="#{build_output_dir}" FRANK_LIBRARY_SEARCH_PATHS="\\"#{frank_lib_directory}\\""|
       else
         extra_opts += " -arch #{options['arch']}"
@@ -111,7 +114,7 @@ module Frank
       app = app.first
       FileUtils.cp_r("#{app}/.", frankified_app_dir)
 
-      if options['mac']
+      if build_mac
         in_root do
           FileUtils.cp_r(
             File.join( 'Frank',static_bundle),
@@ -236,6 +239,88 @@ module Frank
       end
     end
 
+    # The xcodeproj gem doesn't currently support schemes, and schemes have been difficult
+    # to figure out. I plan to either implement schemes in xcodeproj at a later date, or
+    # wait for them to be implemented, and then fix this function
+    def determine_build_patform ( options )
+      project_path = nil
+
+      if options["workspace"] != nil
+        if options["scheme"] != nil
+          workspace = Xcodeproj::Workspace.new_from_xcworkspace(options["workspace"])
+          projects = workspace.projpaths
+
+          projects.each { | current_project |
+            lines = `xcodebuild -project #{current_project} -list`
+
+            found_schemes = false
+
+            lines.split("\n").each { | line |
+              if found_schemes
+                line = line[8..-1]
+
+                if line == ""
+                  found_schemes = false
+                else
+                  if line == options["scheme"]
+                    project_path = current_project
+                  end
+                end
+
+              else
+                line = line [4..-1]
+
+                if line == "Schemes:"
+                  found_schemes = true
+                end
+
+              end
+            }
+          }
+        else
+          say "You must specify a scheme if you specify a workplace"
+          exit 10
+        end
+      else
+        project_path = options["project"]
+      end
+
+      if project_path == nil
+        Dir.foreach(Dir.pwd) { | file |
+          if file.end_with? ".xcodeproj"
+            if project_path != nil
+              say "You must specify a project if there are more than one .xcodeproj bundles in a directory"
+              exit 10
+            else
+              project_path = file
+            end
+          end
+        }
+      end
+
+      project = Xcodeproj::Project.new(project_path)
+
+      target = nil
+
+      if options["target"] != nil
+        project.targets.each { | proj_target |
+          if target.name == options["target"]
+            target = proj_target
+          end
+        }
+      else
+        target = project.targets[0]
+      end
+
+      if target == nil
+        say "Unable to determine a target from the options provided"
+        exit 10
+      end
+
+      return target.platform_name
+
+    end
+
   end
 end
 

data/lib/frank-cucumber/frankifier.rb

@@ -14,10 +14,11 @@ class Frankifier
     @root = Pathname.new( root_dir )
     @target_build_configuration = options[:build_config]
     @target_selection = options[:target]
+    load_xcode_proj_option(options[:project])
   end
 
   def frankify!
-    decide_on_project
+    decide_on_project if @project.nil?
     decide_on_target
     report_project_and_target
 
@@ -33,6 +34,17 @@ class Frankifier
   end
 
   private
+  def load_xcode_proj_option(xcodeproj)
+    if xcodeproj
+      unless File.exists?(xcodeproj)
+        raise "Project file '#{xcodeproj}' does not exist. Please specify the relative path."
+      end
+      
+      @xcodeproj_path = Pathname.new(xcodeproj)
+      @project = Xcodeproj::Project.new(@xcodeproj_path)
+    end
+  end
+  
   def decide_on_project
     projects = Pathname.glob( @root+'*.xcodeproj' )
     xcodeproj = case projects.size

data/lib/frank-cucumber/gesture_helper.rb

@@ -63,6 +63,37 @@ module Frank
 				raise "Could not find anything matching [#{selector}] to double tap" if touch_successes.empty?
 			    raise "Some views could not be double tap (probably because they are not within the current viewport)" if touch_successes.include?(false)
 			end
+			
+			# Drag the slider thumb to required value, taking the specified time
+			#
+			# @param [String] selector A view selector
+			# @param [Number] value The value up to which the slider should be dragged
+			# @param [Number] duration The time interval that the drag should take
+			#
+			#  @return [Array<Boolean>] an array indicating for each view which matched the selector if the value was acceptable or not
+			#
+			# @raise an expection if no views matched the selector
+			# @raise an expection if no views which matched the selector could have their thumbs dragged
+			def drag_thumb_in_slider( selector, value, duration )
+				touch_successes = frankly_map( selector, "FEX_dragThumbToValue:withDuration:", value, duration)
+				raise "Could not find anything matching [#{selector}] to have its thumb dragged" if touch_successes.empty?
+			    raise "Some views could not had their thumbs dragged (are they even UISLiders?)" if touch_successes.include?(false)
+			end
+			
+			# Drag the slider thumb to required value
+			#
+			# @param [String] selector A view selector
+			# @param [Number] value The value up to which the slider should be dragged
+			#
+			#  @return [Array<Boolean>] an array indicating for each view which matched the selector if the value was acceptable or not
+			#
+			# @raise an expection if no views matched the selector
+			# @raise an expection if no views which matched the selector could have their thumbs dragged
+			def drag_thumb_in_slider_with_default_duration( selector, value )
+				touch_successes = frankly_map( selector, "FEX_dragThumbToValue:", value )
+				raise "Could not find anything matching [#{selector}] to have its thumb dragged" if touch_successes.empty?
+			    raise "Some views could not had their thumbs dragged (are they even UISLiders?)" if touch_successes.include?(false)
+			end
 		end
 	end
 end

data/lib/frank-cucumber/version.rb

@@ -1,5 +1,5 @@
 module Frank
   module Cucumber
-    VERSION = "1.1.9.pre1"
+    VERSION = "1.1.10"
   end
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: frank-cucumber
 version: !ruby/object:Gem::Version
-  version: 1.1.9.pre1
-  prerelease: 6
+  version: 1.1.10
+  prerelease: 
 platform: ruby
 authors:
 - Pete Hodgson
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-21 00:00:00.000000000 Z
+date: 2013-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -147,7 +147,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -155,7 +155,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.3
 - !ruby/object:Gem::Dependency
   name: rr
   requirement: !ruby/object:Gem::Requirement
@@ -376,9 +376,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24