calabash-cucumber 0.11.4.pre2 → 0.11.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45d744ca913bb4ebc5bec6c3a50dcd31175ed60f
-  data.tar.gz: 4e5c6be0209c0be93fddac6e9424ae16f0541723
+  metadata.gz: 9f35b46130d00873ebc65afa992b809afcac16f3
+  data.tar.gz: b529c844b3b234fa59cb7818c6deaf7b3e5c26f6
 SHA512:
-  metadata.gz: 063aae27c0dc0097767e918e856efdd38134fa4dfbe4ac7c18ebfe69192f0791cd73e2a835caf275e6244b93665a5b26304611fb8cc4860c0219cc84c8d87796
-  data.tar.gz: 90afa492eb62336bccea9e613210c0b14063642a261eaebf9a1b5c92c1c6532e13fb1931e1389e2790a61caf131c906a5be31ec82ad32c9d5e50b9dc27c02b08
+  metadata.gz: 98dfebb1d8c9ec4d812d3d46206c057a06c65e48ffeea5c7fa2807af26006fefcc611c6ce664aebaad0c7bacdbdd83567e4db99ef297e1f248a4157a9158baed
+  data.tar.gz: 010c95ce4ebc619e404fe9e50c5eb1cd759fcc40ae3b48149a76f2b4ca64f84aa6ff4969758f63c0d875c014163498b270912d1a9088bf15ea0e37beafd63b78

data/lib/calabash-cucumber/utils/plist_buddy.rb

@@ -1,10 +1,7 @@
-require 'calabash-cucumber/utils/logging'
+require 'run_loop'
 
 module Calabash
   module Cucumber
-
-    include Calabash::Cucumber::Logging
-
     # @!visibility private
     # A module for reading and writing property list values.
     module PlistBuddy
@@ -17,16 +14,7 @@ module Calabash
       # @return [String] the value of the key
       # @raise [ArgumentError] if nil or empty key
       def plist_read(key, file, opts={})
-        if key.nil? or key.length == 0
-          raise(ArgumentError, "key '#{key}' must not be nil or empty")
-        end
-        cmd = build_plist_cmd(:print, {:key => key}, file)
-        res = execute_plist_cmd(cmd, opts)
-        if res == "Print: Entry, \":#{key}\", Does Not Exist"
-          nil
-        else
-          res
-        end
+        RunLoop::PlistBuddy.new.plist_read(key, file, opts)
       end
 
       # Checks if the key exists in plist.
@@ -50,128 +38,8 @@ module Calabash
       # @return [Boolean] true if the operation was successful
       # @raise [ArgumentError] if nil or empty key
       def plist_set(key, type, value, file, opts={})
-        default_opts = {:verbose => false}
-        merged = default_opts.merge(opts)
-
-        if key.nil? or key.length == 0
-          raise(ArgumentError, "key '#{key}' must not be nil or empty")
-        end
-
-        cmd_args = {:key => key,
-                    :type => type,
-                    :value => value}
-
-        if plist_key_exists?(key, file, merged)
-          cmd = build_plist_cmd(:set, cmd_args, file)
-        else
-          cmd = build_plist_cmd(:add, cmd_args, file)
-        end
-
-        res = execute_plist_cmd(cmd, merged)
-        res == ''
-      end
-
-      private
-
-      # returns the path to the PlistBuddy executable
-      # @return [String] path to PlistBuddy
-      def plist_buddy
-        '/usr/libexec/PlistBuddy'
+        RunLoop::PlistBuddy.new.plist_set(key, type, value, file, opts)
       end
-
-      # Executes cmd as a shell command and returns the result.
-      #
-      # @param [String] cmd shell command to execute
-      # @param [Hash] opts options for controlling execution
-      # @option opts [Boolean] :verbose (false) controls log level
-      # @return [Boolean] if command was successful
-      # @return [String] if :print'ing result, the value of the key - if there
-      #   is an error, the output from stderr
-      def execute_plist_cmd(cmd, opts={})
-        default_opts = {:verbose => false}
-        merged = default_opts.merge(opts)
-
-        calabash_info(cmd) if merged[:verbose]
-
-        res = nil
-        # noinspection RubyUnusedLocalVariable
-        Open3.popen3(cmd) do |stdin, stdout, stderr, wait_thr|
-          err = stderr.read
-          std = stdout.read
-          if not err.nil? and err != ''
-            res = err.chomp
-          else
-            res = std.chomp
-          end
-        end
-        res
-      end
-
-      # Composes a PlistBuddy command that can be executed as a shell command.
-      #
-      # @param [Symbol] type should be one of [:print, :set, :add]
-      #
-      # @param [Hash] args_hash arguments used to construct plist command
-      # @option args_hash [String] :key (required) the plist key
-      # @option args_hash [String] :value (required for :set and :add) the new value
-      # @option args_hash [String] :type (required for :add) the new type of the value
-      #
-      # @param [String] file the plist file to interact with (must exist)
-      #
-      # @raise [RuntimeError] if file does not exist
-      # @raise [ArgumentError] when invalid type is passed
-      # @raise [ArgumentError] when args_hash does not include required key/value pairs
-      #
-      # @return [String] a shell-ready PlistBuddy command
-      def build_plist_cmd(type, args_hash, file)
-
-        unless File.exist?(File.expand_path(file))
-          raise(RuntimeError, "plist '#{file}' does not exist - could not read")
-        end
-
-        case type
-          when :add
-            value_type = args_hash[:type]
-            unless value_type
-              raise(ArgumentError, ':value_type is a required key for :add command')
-            end
-            allowed_value_types = ['string', 'bool', 'real', 'integer']
-            unless allowed_value_types.include?(value_type)
-              raise(ArgumentError, "expected '#{value_type}' to be one of '#{allowed_value_types}'")
-            end
-            value = args_hash[:value]
-            unless value
-              raise(ArgumentError, ':value is a required key for :add command')
-            end
-            key = args_hash[:key]
-            unless key
-              raise(ArgumentError, ':key is a required key for :add command')
-            end
-            cmd_part = "\"Add :#{key} #{value_type} #{value}\""
-          when :print
-            key = args_hash[:key]
-            unless key
-              raise(ArgumentError, ':key is a required key for :print command')
-            end
-            cmd_part = "\"Print :#{key}\""
-          when :set
-            value = args_hash[:value]
-            unless value
-              raise(ArgumentError, ':value is a required key for :set command')
-            end
-            key = args_hash[:key]
-            unless key
-              raise(ArgumentError, ':key is a required key for :set command')
-            end
-            cmd_part = "\"Set :#{key} #{value}\""
-          else
-            cmds = [:add, :print, :set]
-            raise(ArgumentError, "expected '#{type}' to be one of '#{cmds}'")
-        end
-
-        "#{plist_buddy} -c #{cmd_part} \"#{file}\""
-      end
-
     end
   end
-end
+end

data/lib/calabash-cucumber/utils/xctools.rb

@@ -1,13 +1,14 @@
-require 'open3'
 require 'run_loop'
 
 module Calabash
   module Cucumber
 
+    # @deprecated 0.11.4 Replaced with RunLoop::XCTools.
     # @!visibility private
     # Methods for interacting with the xcode tools.
     module XcodeTools
 
+      # @deprecated 0.11.4 Replaced with RunLoop::XCTools.
       # Returns the path to the current developer directory.
       #
       # From the man pages:
@@ -22,6 +23,7 @@ module Calabash
       #
       # @return [String] path to current developer directory
       def xcode_developer_dir
+        _deprecated('0.11.4', 'Use RunLoop::XCTools', :warn)
         RunLoop::XCTools.new.xcode_developer_dir
       end
 
@@ -33,6 +35,7 @@ module Calabash
         File.expand_path("#{xcode_developer_dir}/usr/bin")
       end
 
+      # @deprecated 0.11.4 Replaced with RunLoop::XCTools.
       # Method for interacting with instruments.
       #
       # @example Getting the path to instruments.
@@ -54,8 +57,10 @@ module Calabash
         return instruments if cmd == nil
         case cmd
           when :version
+            _deprecated('0.11.4', 'Use RunLoop::XCTools', :warn)
             RunLoop::XCTools.new.instruments(cmd).to_s
           when :sims
+            _deprecated('0.11.4', 'Use RunLoop::XCTools', :warn)
             RunLoop::XCTools.new.instruments(cmd)
           else
             candidates = [:version, :sims]
@@ -63,6 +68,7 @@ module Calabash
         end
       end
 
+      # @deprecated 0.11.4 Replaced with RunLoop::XCTools.
       # Does the instruments `version` accept the -s flag?
       #
       # @example
@@ -75,9 +81,11 @@ module Calabash
       #
       # @return [Boolean] true if the version is >= 5.*
       def instruments_supports_hyphen_s?(version)
+        _deprecated('0.11.4', 'Use RunLoop::XCTools', :warn)
         RunLoop::XCTools.new.instruments_supports_hyphen_s?(version)
       end
 
+      # @deprecated 0.11.4 Replaced with RunLoop::XCTools.
       # Returns a list of installed simulators by calling `$ instruments -s devices`.
       # and parsing the output
       # @return [Array<String>] an array of simulator names suitable for passing
@@ -85,6 +93,7 @@ module Calabash
       # @raise [RuntimeError] if the currently active instruments version does
       #   not support the -s flag
       def installed_simulators
+        _deprecated('0.11.4', 'Use RunLoop::XCTools', :warn)
         instruments(:sims)
       end
     end

data/lib/calabash-cucumber/version.rb

@@ -3,11 +3,11 @@ module Calabash
 
     # @!visibility public
     # The Calabash iOS gem version.
-    VERSION = '0.11.4.pre2'
+    VERSION = '0.11.4'
 
     # @!visibility public
     # The minimum required version of the calabash.framework or, for Xamarin
     # users, the Calabash component.
-    MIN_SERVER_VERSION = '0.11.4.pre2'
+    MIN_SERVER_VERSION = '0.11.4'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calabash-cucumber
 version: !ruby/object:Gem::Version
-  version: 0.11.4.pre2
+  version: 0.11.4
 platform: ruby
 authors:
 - Karl Krukow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-05 00:00:00.000000000 Z
+date: 2014-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.10.pre1
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.10.pre1
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -304,6 +304,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: stub_env
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 description: calabash-cucumber drives tests for native iOS apps. You must link your
   app with calabash-ios-server framework to execute tests.
 email:
@@ -495,12 +509,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Client for calabash-ios-server for automated functional testing on iOS