guard-calabash-ios 0.1.0 → 0.2.0

data/README.md

@@ -22,6 +22,10 @@ When you're done, run following commands from project directory
 
 ## Guard options
 
-	all_on_start - run all specs at first start, by default *true*
-	device - iphone or ipad, by default *:iphone*
+	all_on_start - run all specs at first start, by default true
+	device - iphone or ipad, by default :iphone
+	project - project name, if not set, then gem will try to find it by *.xcodeproject expression
+	sdk - ios4, ios5, by default :ios5
+	target - calabash target, by default $project-cal
+	config - Debug/Release, by default Debug
 

data/lib/guard/calabash-ios/runner.rb

@@ -3,25 +3,63 @@ module Guard
     attr_accessor :bundle_path
     attr_accessor :sdk
     attr_accessor :device
+    attr_accessor :project
+    attr_accessor :target
+    attr_accessor :config
     def initialize(options)
-      devices = [:iphone, :ipad]
+      self.sdk = init_sdk(options)
+      self.device = init_device(options)
+      self.project = init_project(options)
+      self.target = init_target(options)
+      self.config = init_config(options)
+      self.bundle_path = init_bundle_path(options)
+    end
+
+    def init_sdk(options)
       sdks = [:ios4, :ios5]
+      if sdks.include? options[:sdk]
+        options[:sdk]
+      else
+        :ios5
+      end
+    end
+
+    def init_device(options)
+      devices = [:iphone, :ipad]
+      if devices.include? options[:device]
+        options[:device]
+      else
+        :iphone
+      end
+    end
+
+    def init_project(options)
       if options[:project].nil?
-        project = Dir.glob("*.xcodeproj").first
-        if project
-          options[:project] = project.gsub(".xcodeproj","")
+        xproject = Dir.glob("*.xcodeproj").first
+        if xproject
+          xproject.gsub(".xcodeproj","")
         else
-          UI.info "You must specify project name at your Guardfile."
+          UI.info "Could not find project"
+          nil
         end
+      else
+        options[:project]
       end
-      self.bundle_path = bundle(options)
-      self.sdk =:ios5
-      if sdks.include? options[:sdk]
-        self.sdk = options[:sdk]
+    end
+
+    def init_config(options)
+      if options[:config].nil?
+        "Debug"
+      else
+        options[:config]
       end
-      self.device = :iphone
-      if devices.include? options[:device]
-        self.device = options[:device]
+    end
+
+    def init_target(options)
+      if options[:target].nil?
+        "#{self.project}-cal"
+      else
+        options[:target]
       end
     end
 
@@ -30,7 +68,7 @@ module Guard
         UI.info "Could not run Calabash. \n'#{self.bundle_path}' not found."
         return false
       end
-      if features.eql?("features")
+      if features.eql?("features") or features.empty?
         start_message = "Run all features"
       else
         features = features.join(' ') if features.kind_of? Array
@@ -44,15 +82,22 @@ module Guard
       if features.kind_of? Array
         features = features.join(' ')
       end
-      "APP_BUNDLE_PATH='#{self.bundle_path}' OS=#{self.sdk} DEVICE=#{self.device} cucumber #{features} --require features"
+      cmd = []
+      cmd << "APP_BUNDLE_PATH='#{self.bundle_path}'"
+      cmd << "OS=#{self.sdk}"
+      cmd << "DEVICE=#{self.device}"
+      cmd << "cucumber #{features} --require features"
+      cmd.join ' '
     end
 
-    def bundle(options)
-      pwd = Dir::pwd
-      project = options[:project]
-      target = options[:target] || "frankified"
-      config = options[:config] || "Debug"
-      bundle_path = "#{pwd}/DerivedData/#{project}/Build/Products/#{config}-iphonesimulator/#{project}-cal.app"
+    def init_bundle_path(options)
+      path = []
+      path << "#{Dir::pwd}/DerivedData/"
+      path << "#{self.project}/"
+      path << "Build/Products/"
+      path << "#{self.config}-iphonesimulator/"
+      path << "#{self.target}.app"
+      path.join
     end
   end
 end

data/lib/guard/calabash-ios/version.rb

@@ -1,6 +1,6 @@
 module Guard
   module CalabashiOSVersion
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: guard-calabash-ios
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Alex Denisov
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-16 00:00:00 Z
+date: 2012-05-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: guard