run_loop 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48987ab3216b9f32eca927721cdbfa4e81d5f4bd
-  data.tar.gz: 790af8c1087bf824cc75147fa1b636210b268674
+  metadata.gz: 9da716f7c4eedfede252a5aaac22eae7f1ee78a2
+  data.tar.gz: 957fa9424bbf824af7abf0c95c92875a9d823f4b
 SHA512:
-  metadata.gz: 0a8aec93d2cb4922b59b116d4b7c478301ce8597e3ef359ccccc567f48052c616f81ea97b38bed46825e55b8589da516ead349f9c1b2fc44fcbe06d2fb18b629
-  data.tar.gz: 1997c6e2ac97f2c38be03468654c55dce4973d36e764bf211c7b8d3fd7d8813ca0452610b203e432779744d3c202d51fb0dc9f0324f8d77eca457b735063b15e
+  metadata.gz: b360c995c90565518d15b3a79431211010e123f10a05712a25b2061e8ce50d650ce3993e2cbe6ce7fadf1710019082ef61bcf058ef92949e7da15edc8c1d1cc4
+  data.tar.gz: 0dc1b9c88db2367aec2a565c1813bab0772cf863fbc8237316db452930875ff5cb1bb2ee6fbee94d393eeac5a09028c755c04449b536aca01799fbc2dccc03fc

data/lib/run_loop.rb

@@ -6,4 +6,4 @@ require 'run_loop/sim_control'
 require 'run_loop/device'
 require 'run_loop/instruments'
 require 'run_loop/lipo'
-
+require 'run_loop/host_cache'

data/lib/run_loop/core.rb

@@ -170,6 +170,7 @@ module RunLoop
       uia_strategy = options[:uia_strategy]
       if uia_strategy == :host
         create_uia_pipe(repl_path)
+        RunLoop::HostCache.default.clear
       end
 
       cal_script = File.join(SCRIPTS_PATH, 'calabash_script_uia.js')
@@ -409,11 +410,11 @@ module RunLoop
     #  version.
     def self.default_simulator(xcode_tools=RunLoop::XCTools.new)
       if xcode_tools.xcode_version_gte_62?
-        'iPhone 5 (8.2 Simulator)'
+        'iPhone 5s (8.2 Simulator)'
       elsif xcode_tools.xcode_version_gte_61?
-        'iPhone 5 (8.1 Simulator)'
+        'iPhone 5s (8.1 Simulator)'
       elsif xcode_tools.xcode_version_gte_6?
-        'iPhone 5 (8.0 Simulator)'
+        'iPhone 5s (8.0 Simulator)'
       else
         'iPhone Retina (4-inch) - Simulator - iOS 7.1'
       end
@@ -511,7 +512,7 @@ module RunLoop
         raise RunLoop::WriteFailedError.new("Trying write of command #{cmd_str} at index #{index}")
       end
       run_loop[:index] = index + 1
-
+      RunLoop::HostCache.default.write(run_loop)
       index
     end
 
@@ -534,7 +535,6 @@ module RunLoop
     end
 
     def self.read_response(run_loop, expected_index, empty_file_timeout=10, search_for_property='index')
-
       log_file = run_loop[:log_file]
       initial_offset = run_loop[:initial_offset] || 0
       offset = initial_offset
@@ -606,9 +606,8 @@ module RunLoop
       end
 
       run_loop[:initial_offset] = offset
-
+      RunLoop::HostCache.default.write(run_loop)
       result
-
     end
 
     # @deprecated 1.0.5

data/lib/run_loop/host_cache.rb

@@ -0,0 +1,106 @@
+require 'fileutils'
+require 'digest/sha1'
+
+module RunLoop
+
+  # @!visibility private
+  # A class for managing an on-disk hash table that represents the current
+  # state of the :host strategy run-loop.  It is used by Calabash iOS
+  # `console_attach` method.
+  # @see http://calabashapi.xamarin.com/ios/Calabash/Cucumber/Core.html#console_attach-instance_method
+  #
+  # Marshal is safe to use here because:
+  # 1. This code is not executed on the XTC.
+  # 2. Users who muck about with this cache can only hurt themselves.
+  class HostCache
+
+    # The path to the cache file.
+    #
+    # @!attribute [r] path
+    # @return [String] An expanded path to the cache file.
+    attr_reader :path
+
+    # The directory where the cache is stored.
+    # @return [String] Expanded path to the default cache directory.
+    def self.default_directory
+      File.expand_path('/tmp/run-loop-host-cache')
+    end
+
+    # The default cache.
+    def self.default
+      RunLoop::HostCache.new(self.default_directory)
+    end
+
+    # Creates a new HostCache that is ready for IO.
+    #
+    # @param [String] directory The directory where the cache file is located.
+    #  If the directory does not exist, it will be created.
+    # @options [Hash] options Options to control the state of the new object.
+    # @option [String] filename (host_run_loop.hash) The cache filename.
+    # @option [Boolean] clear (false) If true, the current cache will be cleared.
+    # @return [RunLoop::HostCache] A cache that is ready for IO.
+    def initialize(directory, options = {})
+      sha1 = Digest::SHA1.hexdigest 'host_run_loop.hash'
+      default_opts = {:filename => sha1,
+                      :clear => false}
+      merged_opts = default_opts.merge(options)
+
+      dir_expanded = File.expand_path(directory)
+      unless Dir.exist?(dir_expanded)
+        FileUtils.mkdir_p(dir_expanded)
+      end
+
+      @path = File.join(dir_expanded, merged_opts[:filename])
+
+      if merged_opts[:clear] && File.exist?(@path)
+        FileUtils.rm_rf @path
+      end
+    end
+
+    # Reads the current cache.
+    # @return [Hash] A hash representation of the current state of the run-loop.
+    def read
+      if File.exist? @path
+        File.open(@path) do |file|
+          Marshal.load(file)
+        end
+      else
+        self.write({})
+        self.read
+      end
+    end
+
+    # @!visibility private
+    #
+    # Writes `hash` as a serial object.  The existing data is overwritten.
+    #
+    # @param [Hash] hash The hash to write.
+    # @raise [ArgumentError] The `hash` parameter must not be nil and it must
+    #  be a Hash.
+    # @raise [TypeError] If the hash contains objects that cannot be written
+    #  by Marshal.dump.
+    #
+    # @return [Boolean] Returns true if `hash` was successfully Marshal.dump'ed.
+    def write(hash)
+      if hash.nil?
+        raise ArgumentError, 'Expected the hash parameter to be non-nil'
+      end
+
+      unless hash.is_a?(Hash)
+        raise ArgumentError, "Expected #{hash} to a Hash, but it is a #{hash.class}"
+      end
+
+      File.open(@path, 'w+') do |file|
+        Marshal.dump(hash, file)
+      end
+      true
+    end
+
+    # @!visibility private
+    # Clears the current cache.
+    # @return [Boolean] Returns true if the hash was cleared.
+    def clear
+      self.write({})
+    end
+  end
+end

data/lib/run_loop/version.rb

@@ -1,5 +1,5 @@
 module RunLoop
-  VERSION = '1.2.2'
+  VERSION = '1.2.3'
 
   # A model of a software release version that can be used to compare two versions.
   #
@@ -148,11 +148,14 @@ module RunLoop
         return a.patch.to_i > b.patch.to_i ? 1 : -1
       end
 
-      return 1 if a.pre and (not b.pre)
-      return -1 if (not a.pre) and b.pre
+      return -1 if a.pre and (not a.pre_version) and b.pre_version
+      return 1 if a.pre_version and b.pre and (not b.pre_version)
 
-      return 1 if a.pre_version and (not b.pre_version)
-      return -1 if (not a.pre_version) and b.pre_version
+      return -1 if a.pre and (not b.pre)
+      return 1 if (not a.pre) and b.pre
+
+      return -1 if a.pre_version and (not b.pre_version)
+      return 1 if (not a.pre_version) and b.pre_version
 
       if a.pre_version != b.pre_version
         return a.pre_version.to_i > b.pre_version.to_i ? 1 : -1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: run_loop
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Karl Krukow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-10 00:00:00.000000000 Z
+date: 2015-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -28,16 +28,16 @@ dependencies:
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: retriable
   requirement: !ruby/object:Gem::Requirement
@@ -221,6 +221,7 @@ files:
 - lib/run_loop/cli.rb
 - lib/run_loop/core.rb
 - lib/run_loop/device.rb
+- lib/run_loop/host_cache.rb
 - lib/run_loop/instruments.rb
 - lib/run_loop/lipo.rb
 - lib/run_loop/plist_buddy.rb