zucchini-ios 0.5.8 → 0.5.9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    zucchini-ios (0.5.6)
+    zucchini-ios (0.5.9)
       clamp
 
 GEM

data/lib/config.rb

@@ -10,10 +10,17 @@ module Zucchini
     def self.base_path=(base_path)
       @@base_path = base_path
       @@config    = YAML::load_file("#{base_path}/support/config.yml")
+      @@default_device_name = nil
+      devices.each do |device_name, device|
+        if device['default']
+          raise "Default device already provided" if @@default_device_name
+          @@default_device_name = device_name
+        end
+      end
     end
 
     def self.app
-      device_name = ENV['ZUCCHINI_DEVICE']
+      device_name = ENV['ZUCCHINI_DEVICE'] || @@default_device_name
       app_path    = File.absolute_path(devices[device_name]['app'] || @@config['app'])
 
       if device_name == 'iOS Simulator' && !File.exists?(app_path)
@@ -30,7 +37,13 @@ module Zucchini
       @@config['devices']
     end
 
+    def self.default_device_name
+      @@default_device_name
+    end
+
     def self.device(device_name)
+      device_name ||= @@default_device_name
+      raise "Neither default device nor ZUCCHINI_DEVICE environment variable was set" unless device_name
       raise "Device not listed in config.yml" unless (device = devices[device_name])
       {
         :name   => device_name,

data/lib/detector.rb

@@ -9,7 +9,6 @@ class Zucchini::Detector < Clamp::Command
     @path = File.expand_path(path)
     Zucchini::Config.base_path = File.exists?("#{path}/feature.zucchini") ? File.dirname(path) : path
 
-    raise "ZUCCHINI_DEVICE environment variable not set" unless ENV['ZUCCHINI_DEVICE']
     @device = Zucchini::Config.device(ENV['ZUCCHINI_DEVICE'])
     
     @template = detect_template

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Zucchini
-  VERSION = "0.5.8"
+  VERSION = "0.5.9"
 end

data/spec/lib/config_spec.rb

@@ -4,16 +4,27 @@ describe Zucchini::Config do
   before(:all) { Zucchini::Config.base_path = "spec/sample_setup" }
   
   describe "device" do
-   context "device present in config.yml" do
-    it "should return the device hash" do
-      Zucchini::Config.device("My iDevice").should eq({:name =>"My iDevice", :udid =>"lolffb28d74a6fraj2156090784avasc50725dd0", :screen =>"ipad_ios5"})
+    context "device present in config.yml" do
+      it "should return the device hash" do
+        Zucchini::Config.device("My iDevice").should eq({:name =>"My iDevice", :udid =>"lolffb28d74a6fraj2156090784avasc50725dd0", :screen =>"ipad_ios5"})
+      end
     end
-   end
    
-   context "device not present in config.yml" do
-     it "should raise an error" do
-       expect { Zucchini::Config.device("My Android Phone")}.to raise_error "Device not listed in config.yml"
-     end
+    context "device not present in config.yml" do
+      it "should raise an error" do
+        expect { Zucchini::Config.device("My Android Phone")}.to raise_error "Device not listed in config.yml"
+      end
+    end
+
+    context "default device" do
+      it "should use default device if device name argument is nil" do
+        Zucchini::Config.device(nil).should eq({:name =>"Default Device", :screen =>"low_ios5", :udid => nil})
+      end
+
+      it "should raise error if no default device provided" do
+        Zucchini::Config.base_path = "spec/sample_setup_2"
+        expect { Zucchini::Config.device(nil) }.to raise_error "Neither default device nor ZUCCHINI_DEVICE environment variable was set"
+      end
     end
   end
   

data/spec/sample_setup/support/config.yml

@@ -5,6 +5,10 @@ devices:
     UDID  : lolffb28d74a6fraj2156090784avasc50725dd0
     screen: ipad_ios5
 
+  Default Device:
+    screen : low_ios5
+    default: true
+
 
 servers:
   backend:

data/spec/sample_setup_2/support/config.yml

@@ -0,0 +1,15 @@
+app: MyApp.app
+
+devices:
+  My iDevice:
+    UDID  : lolffb28d74a6fraj2156090784avasc50725dd0
+    screen: ipad_ios5
+
+  Default Device:
+    screen : low_ios5
+
+
+servers:
+  backend:
+    host: 192.168.1.2
+    port: 8080

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zucchini-ios
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.5.9
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-03 00:00:00.000000000 Z
+date: 2013-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -117,6 +117,7 @@ files:
 - spec/sample_setup/support/lib/helpers.coffee
 - spec/sample_setup/support/masks/retina_ios5.png
 - spec/sample_setup/support/screens/splash.coffee
+- spec/sample_setup_2/support/config.yml
 - spec/spec_helper.rb
 - templates/feature/feature.zucchini
 - templates/feature/masks/retina_ios5/.gitkeep
@@ -178,4 +179,5 @@ test_files:
 - spec/sample_setup/support/lib/helpers.coffee
 - spec/sample_setup/support/masks/retina_ios5.png
 - spec/sample_setup/support/screens/splash.coffee
+- spec/sample_setup_2/support/config.yml
 - spec/spec_helper.rb