snapshot 1.12.2 → 1.12.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f66739b39604b0850729cdbc3ec8b7c285b8dc0d
-  data.tar.gz: a724757422b90bd6b7c438d2550322d0c19422fc
+  metadata.gz: 3a2f6706dde254c8ec5cf7470a1539cb7cbdc83f
+  data.tar.gz: 41ed453012760f5795b1f54262d286d1e3e38271
 SHA512:
-  metadata.gz: 6ea43999e4268e07952c39b1788e35ff0609d150d10e6ef71eda5b556aea4368f51270039caf0928d596f532b1a575fa298a168744688e8252b6039aa9887f5c
-  data.tar.gz: 87eb051ee9eee593b5e264426c7caa810bc3077cc7909a92f245b53f65a8741701dea62037bfbb7a15addff8d556cd146d1b22b4b93e2481985c3cfda35a141c
+  metadata.gz: 8f5d96bed914afa3ce3c54ea5afac1b6f16ebf3ca7657804721495b735fb7f4eee8ad7b105ed69ddcfb875fc7bfb82f7212b39f23643908297b0e070713b5bdc
+  data.tar.gz: 434a2585a607f638397bcb422e3601e26425e8448e5004933c13b46e0ded3726a025ca5bccfa876cd13448f7a85f0c2deece84b694ce8f1ce7c30a9c18f44315

data/bin/snapshot

@@ -1,113 +1,6 @@
 #!/usr/bin/env ruby
-
 $:.push File.expand_path("../../lib", __FILE__)
 
 require 'snapshot'
-require 'commander'
-
-HighLine.track_eof = false
-
-class SnapshotApplication
-  include Commander::Methods
-
-  # rubocop:disable Metrics/MethodLength
-  def run
-    program :version, Snapshot::VERSION
-    program :description, 'CLI for \'snapshot\' - Automate taking localized screenshots of your iOS app on every device'
-    program :help, 'Author', 'Felix Krause <snapshot@krausefx.com>'
-    program :help, 'Website', 'https://fastlane.tools'
-    program :help, 'GitHub', 'https://github.com/fastlane/snapshot'
-    program :help_formatter, :compact
-
-    global_option('--verbose', 'Shows a more verbose output') { $verbose = true }
-
-    always_trace!
-
-    FastlaneCore::CommanderGenerator.new.generate(Snapshot::Options.available_options)
-
-    command :run do |c|
-      c.syntax = 'snapshot'
-      c.description = 'Take new screenshots based on the Snapfile.'
-
-      c.action do |args, options|
-        load_config(options)
-
-        Snapshot::DependencyChecker.check_simulators
-        Snapshot::Runner.new.work
-      end
-    end
-
-    command :init do |c|
-      c.syntax = 'snapshot init'
-      c.description = "Creates a new Snapfile in the current directory"
-
-      c.action do |args, options|
-        require 'snapshot/setup'
-        path = (Snapshot::Helper.fastlane_enabled? ? './fastlane' : '.')
-        Snapshot::Setup.create(path)
-      end
-    end
-
-    command :update do |c|
-      c.syntax = 'snapshot update'
-      c.description = "Updates your SnapshotHelper.swift to the latest version"
-
-      c.action do |args, options|
-        require 'snapshot/update'
-        Snapshot::Update.new.update
-      end
-    end
-
-    command :reset_simulators do |c|
-      c.syntax = 'snapshot reset_simulators'
-      c.description = "This will remove all your existing simulators and re-create new ones"
-      c.option '-i', '--ios String', String, 'The comma separated list of iOS Versions you want to use'
-
-      c.action do |args, options|
-        options.default ios_version: Snapshot::LatestIosVersion.version
-        versions = options.ios_version.split(',') if options.ios_version
-        require 'snapshot/reset_simulators'
-
-        Snapshot::ResetSimulators.clear_everything!(versions)
-      end
-    end
-
-    command :clear_derived_data do |c|
-      c.syntax = 'snapshot clear_derived_data -f path'
-      c.description = "Clear the directory where build products and other derived data will go"
-
-      c.action do |args, options|
-        load_config(options)
-        derived_data_path = Snapshot.config[:derived_data_path]
-
-        if !derived_data_path
-          Snapshot::UI.user_error! "No derived_data_path"
-        elsif !Dir.exist?(derived_data_path)
-          Snapshot::UI.important "Path #{derived_data_path} does not exist"
-        else
-          FileUtils.rm_rf(derived_data_path)
-          Snapshot::UI.success "Removed #{derived_data_path}"
-        end
-      end
-    end
-
-    default_command :run
-
-    run!
-  end
-
-  private
-
-  def load_config(options)
-    o = options.__hash__.dup
-    o.delete(:verbose)
-    Snapshot.config = FastlaneCore::Configuration.create(Snapshot::Options.available_options, o)
-  end
-end
-
-begin
-  FastlaneCore::UpdateChecker.start_looking_for_update('snapshot')
-  SnapshotApplication.new.run
-ensure
-  FastlaneCore::UpdateChecker.show_update_status('snapshot', Snapshot::VERSION)
-end
+require 'snapshot/commands_generator'
+Snapshot::CommandsGenerator.start

data/lib/snapshot/commands_generator.rb

@@ -0,0 +1,110 @@
+require 'commander'
+
+HighLine.track_eof = false
+
+module Snapshot
+  class CommandsGenerator
+    include Commander::Methods
+
+    def self.start
+      FastlaneCore::UpdateChecker.start_looking_for_update('snapshot')
+      self.new.run
+    ensure
+      FastlaneCore::UpdateChecker.show_update_status('snapshot', Snapshot::VERSION)
+    end
+
+    # rubocop:disable Metrics/MethodLength
+    def run
+      program :version, Snapshot::VERSION
+      program :description, 'CLI for \'snapshot\' - Automate taking localized screenshots of your iOS app on every device'
+      program :help, 'Author', 'Felix Krause <snapshot@krausefx.com>'
+      program :help, 'Website', 'https://fastlane.tools'
+      program :help, 'GitHub', 'https://github.com/fastlane/snapshot'
+      program :help_formatter, :compact
+
+      global_option('--verbose', 'Shows a more verbose output') { $verbose = true }
+
+      always_trace!
+
+      FastlaneCore::CommanderGenerator.new.generate(Snapshot::Options.available_options)
+
+      command :run do |c|
+        c.syntax = 'snapshot'
+        c.description = 'Take new screenshots based on the Snapfile.'
+
+        c.action do |args, options|
+          load_config(options)
+
+          Snapshot::DependencyChecker.check_simulators
+          Snapshot::Runner.new.work
+        end
+      end
+
+      command :init do |c|
+        c.syntax = 'snapshot init'
+        c.description = "Creates a new Snapfile in the current directory"
+
+        c.action do |args, options|
+          require 'snapshot/setup'
+          path = (Snapshot::Helper.fastlane_enabled? ? './fastlane' : '.')
+          Snapshot::Setup.create(path)
+        end
+      end
+
+      command :update do |c|
+        c.syntax = 'snapshot update'
+        c.description = "Updates your SnapshotHelper.swift to the latest version"
+
+        c.action do |args, options|
+          require 'snapshot/update'
+          Snapshot::Update.new.update
+        end
+      end
+
+      command :reset_simulators do |c|
+        c.syntax = 'snapshot reset_simulators'
+        c.description = "This will remove all your existing simulators and re-create new ones"
+        c.option '-i', '--ios String', String, 'The comma separated list of iOS Versions you want to use'
+
+        c.action do |args, options|
+          options.default ios_version: Snapshot::LatestIosVersion.version
+          versions = options.ios_version.split(',') if options.ios_version
+          require 'snapshot/reset_simulators'
+
+          Snapshot::ResetSimulators.clear_everything!(versions)
+        end
+      end
+
+      command :clear_derived_data do |c|
+        c.syntax = 'snapshot clear_derived_data -f path'
+        c.description = "Clear the directory where build products and other derived data will go"
+
+        c.action do |args, options|
+          load_config(options)
+          derived_data_path = Snapshot.config[:derived_data_path]
+
+          if !derived_data_path
+            Snapshot::UI.user_error! "No derived_data_path"
+          elsif !Dir.exist?(derived_data_path)
+            Snapshot::UI.important "Path #{derived_data_path} does not exist"
+          else
+            FileUtils.rm_rf(derived_data_path)
+            Snapshot::UI.success "Removed #{derived_data_path}"
+          end
+        end
+      end
+
+      default_command :run
+
+      run!
+    end
+
+    private
+
+    def load_config(options)
+      o = options.__hash__.dup
+      o.delete(:verbose)
+      Snapshot.config = FastlaneCore::Configuration.create(Snapshot::Options.available_options, o)
+    end
+  end
+end

data/lib/snapshot/reset_simulators.rb

@@ -35,16 +35,7 @@ module Snapshot
         end
       end
 
-      phones = []
-      watches = []
-      devices.each do |device|
-        _, name, id = device
-        phones << id if name.start_with?('iPhone 6')
-        watches << id if name.end_with?('mm')
-      end
-
-      puts "Creating device pair of #{phones.last} and #{watches.last}"
-      `xcrun simctl pair #{watches.last} #{phones.last}`
+      make_phone_watch_pair
     end
 
     def self.create(device_type, os_versions, os_name = 'iOS')
@@ -59,7 +50,7 @@ module Snapshot
     end
 
     def self.devices
-      all_devices = `xcrun simctl list devices`
+      all_devices = Helper.backticks('xcrun simctl list devices', print: $verbose)
       # == Devices ==
       # -- iOS 9.0 --
       #   iPhone 4s (32246EBC-33B0-47F9-B7BB-5C23C550DF29) (Shutdown)
@@ -69,10 +60,29 @@ module Snapshot
       #   iPhone 4s (FE9D6F85-1C51-4FE6-8597-FCAB5286B869) (Shutdown) (unavailable, runtime profile not found)
 
       result = all_devices.lines.map do |line|
-        (line.match(/\s+([\w\s]+)\s\(([\w\-]+)\)/) || []).to_a
+        (line.match(/\s+(.+?)\s\(([\w\-]+)\).*/) || []).to_a
       end
 
       result.select { |parsed| parsed.length == 3 } # we don't care about those headers
     end
+
+    def self.make_phone_watch_pair
+      phones = []
+      watches = []
+      devices.each do |device|
+        full_line, name, id = device
+        phones << id if name.start_with?('iPhone 6') && device_line_usable?(full_line)
+        watches << id if name.end_with?('mm') && device_line_usable?(full_line)
+      end
+
+      if phones.any? && watches.any?
+        puts "Creating device pair of #{phones.last} and #{watches.last}"
+        Helper.backticks("xcrun simctl pair #{watches.last} #{phones.last}", print: $verbose)
+      end
+    end
+
+    def self.device_line_usable?(line)
+      !line.include?("unavailable")
+    end
   end
 end

data/lib/snapshot/version.rb

@@ -1,4 +1,4 @@
 module Snapshot
-  VERSION = "1.12.2".freeze
+  VERSION = "1.12.3".freeze
   DESCRIPTION = "Automate taking localized screenshots of your iOS app on every device"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: snapshot
 version: !ruby/object:Gem::Version
-  version: 1.12.2
+  version: 1.12.3
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-06 00:00:00.000000000 Z
+date: 2016-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastimage
@@ -227,6 +227,7 @@ files:
 - lib/assets/SnapshotHelper.swift
 - lib/snapshot.rb
 - lib/snapshot/collector.rb
+- lib/snapshot/commands_generator.rb
 - lib/snapshot/dependency_checker.rb
 - lib/snapshot/detect_values.rb
 - lib/snapshot/error_handler.rb