snapshot 0.10.2 → 1.0.1

data/lib/snapshot/screenshot_flatten.rb

@@ -10,9 +10,9 @@ module Snapshot
     def flatten(path)
       Dir.glob([path, '/**/*.png'].join('/')).each do |file|
         Helper.log.info "Removing alpha channel from '#{file}'" if $verbose
-        `sips -s format bmp '#{file}' &> /dev/null ` # &> /dev/null because there is warning because of the extension
+        `sips -s format bmp '#{file}' &> /dev/null` # &> /dev/null because there is warning because of the extension
         `sips -s format png '#{file}'`
       end
     end
   end
-end
+end

data/lib/snapshot/screenshot_rotate.rb

@@ -22,19 +22,17 @@ module Snapshot
           command = "sips -r 180 '#{file}'"
         end
 
+        next unless command
+
         # Only rotate if we need to
-        if command
-          PTY.spawn( command ) do |r, w, pid|
-            r.sync
-            r.each do |line|
-              # We need to read this otherwise things hang
-            end
-            ::Process.wait pid
+        PTY.spawn(command) do |r, w, pid|
+          r.sync
+          r.each do |line|
+            # We need to read this otherwise things hang
           end
+          ::Process.wait pid
         end
-
       end
     end
-
   end
 end

data/lib/snapshot/setup.rb

@@ -0,0 +1,33 @@
+module Snapshot
+  class Setup
+    # This method will take care of creating a Snapfile and other necessary files
+    def self.create(path)
+      snapfile_path = File.join(path, 'Snapfile')
+
+      if File.exist?(snapfile_path)
+        raise "Snapfile already exists at path '#{snapfile_path}'. Run 'snapshot' to use snapshot.".red
+      end
+
+      gem_path = Helper.gem_path("snapshot")
+      File.write(snapfile_path, File.read("#{gem_path}/lib/assets/SnapfileTemplate"))
+      File.write(File.join(path, 'SnapshotHelper.swift'), File.read("#{gem_path}/lib/assets/SnapshotHelper.swift"))
+
+      puts "Successfully created SnapshotHelper.js '#{File.join(path, 'SnapshotHelper.swift')}'".green
+      puts "Successfully created new Snapfile at '#{snapfile_path}'".green
+
+      puts "-------------------------------------------------------".yellow
+      puts "Open your Xcode project and make sure to do the following:".yellow
+      puts "1) Add the ./SnapshotHelper.swift to your UI Test target".yellow
+      puts "   You can move the file anywhere you want".yellow
+      puts "2) Call `setLanguage(app)` when launching your app".yellow
+      puts ""
+      puts "  let app = XCUIApplication()"
+      puts "  setLanguage(app)"
+      puts "  app.launch()"
+      puts ""
+      puts "3) Add `snapshot(\"0Launch\")` to wherever you want to create the screenhsots".yellow
+      puts ""
+      puts "More information on GitHub: https://github.com/krausefx/snapshot".green
+    end
+  end
+end

data/lib/snapshot/test_command_generator.rb

@@ -0,0 +1,93 @@
+module Snapshot
+  # Responsible for building the fully working xcodebuild command
+  class TestCommandGenerator
+    class << self
+      def generate(device_type: nil)
+        parts = prefix
+        parts << "xcodebuild"
+        parts += options
+        parts += destination(device_type)
+        parts += actions
+        parts += suffix
+        parts += pipe
+
+        parts
+      end
+
+      def prefix
+        ["set -o pipefail &&"]
+      end
+
+      # Path to the project or workspace as parameter
+      # This will also include the scheme (if given)
+      # @return [Array] The array with all the components to join
+      def project_path_array
+        proj = Snapshot.project.xcodebuild_parameters
+        return proj if proj.count > 0
+        raise "No project/workspace found"
+      end
+
+      def options
+        config = Snapshot.config
+
+        options = []
+        options += project_path_array
+        options << "-configuration '#{config[:configuration]}'" if config[:configuration]
+        options << "-sdk '#{config[:sdk]}'" if config[:sdk]
+        options << "-derivedDataPath '#{derived_data_path}'"
+        # options << "-xcconfig '#{config[:xcconfig]}'" if config[:xcconfig]
+        # options << "-archivePath '#{archive_path}'"
+        # options << config[:xcargs] if config[:xcargs]
+
+        options
+      end
+
+      def actions
+        actions = []
+        # actions << :clean if config[:clean]
+        actions << :test
+
+        actions
+      end
+
+      def suffix
+        []
+      end
+
+      def pipe
+        ["| tee '#{xcodebuild_log_path}' | xcpretty"]
+      end
+
+      def destination(device)
+        # we now fetch the device's udid. Why? Because we might get this error message
+        # > The requested device could not be found because multiple devices matched the request.
+        #
+        # This happens when you have multiple simulators for a given device type / iOS combination
+        #   { platform:iOS Simulator, id:1685B071-AFB2-4DC1-BE29-8370BA4A6EBD, OS:9.0, name:iPhone 5 }
+        #   { platform:iOS Simulator, id:A141F23B-96B3-491A-8949-813B376C28A7, OS:9.0, name:iPhone 5 }
+        #
+
+        device_udid = nil
+        FastlaneCore::Simulator.all.each do |sim|
+          device_udid = sim.udid if sim.name.strip == device.strip
+        end
+
+        value = "platform=iOS Simulator,id=#{device_udid},OS=#{Snapshot.config[:ios_version]}"
+
+        return ["-destination '#{value}'"]
+      end
+
+      def xcodebuild_log_path
+        file_name = "#{Snapshot.project.app_name}-#{Snapshot.config[:scheme]}.log"
+        containing = File.expand_path(Snapshot.config[:buildlog_path])
+        FileUtils.mkdir_p(containing)
+
+        return File.join(containing, file_name)
+      end
+
+      def derived_data_path
+        "/tmp/snapshot_derived/"
+      end
+    end
+  end
+end

data/lib/snapshot/version.rb

@@ -1,3 +1,4 @@
 module Snapshot
-  VERSION = "0.10.2"
+  VERSION = "1.0.1"
+  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: 0.10.2
+  version: 1.0.1
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-17 00:00:00.000000000 Z
+date: 2015-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastimage
@@ -30,7 +30,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: 0.21.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -40,10 +40,38 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: 0.21.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: xcpretty
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: plist
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -115,7 +143,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.8.7.4
 - !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -128,6 +156,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: fastlane
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.34'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.34'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.19.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.19.0
 description: Automate taking localized screenshots of your iOS app on every device
 email:
 - snapshot@krausefx.com
@@ -140,22 +210,22 @@ files:
 - README.md
 - bin/snapshot
 - lib/assets/SnapfileTemplate
-- lib/assets/SnapshotHelper.js
-- lib/assets/snapshot.js
+- lib/assets/SnapshotHelper.swift
 - lib/snapshot.rb
-- lib/snapshot/builder.rb
+- lib/snapshot/collector.rb
 - lib/snapshot/dependency_checker.rb
+- lib/snapshot/detect_values.rb
+- lib/snapshot/error_handler.rb
 - lib/snapshot/latest_ios_version.rb
+- lib/snapshot/options.rb
 - lib/snapshot/page.html.erb
 - lib/snapshot/reports_generator.rb
 - lib/snapshot/reset_simulators.rb
 - lib/snapshot/runner.rb
 - lib/snapshot/screenshot_flatten.rb
 - lib/snapshot/screenshot_rotate.rb
-- lib/snapshot/simulators.rb
-- lib/snapshot/snapfile_creator.rb
-- lib/snapshot/snapshot_config.rb
-- lib/snapshot/snapshot_file.rb
+- lib/snapshot/setup.rb
+- lib/snapshot/test_command_generator.rb
 - lib/snapshot/version.rb
 homepage: https://fastlane.tools
 licenses:
@@ -177,7 +247,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Automate taking localized screenshots of your iOS app on every device

data/lib/assets/SnapshotHelper.js

@@ -1,63 +0,0 @@
-function wait_for_loading_indicator_to_be_finished()
-{
-  try {
-    re = UIATarget.localTarget().frontMostApp().statusBar().elements()[2].rect()
-    re2 = UIATarget.localTarget().frontMostApp().statusBar().elements()[3].rect()
-    while ((re['size']['width'] == 10 && re['size']['height'] == 20) ||
-           (re2['size']['width'] == 10 && re2['size']['height'] == 20))
-     {
-      UIALogger.logMessage("Loading indicator is visible... waiting")
-      UIATarget.localTarget().delay(1)
-      re = UIATarget.localTarget().frontMostApp().statusBar().elements()[2].rect()
-      re2 = UIATarget.localTarget().frontMostApp().statusBar().elements()[3].rect()
-    }
-  } catch (e) {}
-}
-
-function isTablet()
-{
-  return !(UIATarget.localTarget().model().match(/iPhone/))
-}
-
-function captureLocalizedScreenshot(name) {
-  wait_for_loading_indicator_to_be_finished();
-
-  var target = UIATarget.localTarget();
-  var model = target.model();
-  var rect = target.rect();
-  var deviceOrientation = target.deviceOrientation();
-  
-  var theSize = (rect.size.width > rect.size.height) ? rect.size.width.toFixed() : rect.size.height.toFixed();
-
-  if (model.match(/iPhone/)) 
-  {
-    if (theSize > 667) {
-      model = "iPhone6Plus";
-    } else if (theSize == 667) {
-      model = "iPhone6";
-    } else if (theSize == 568){
-      model = "iPhone5";
-    } else {
-    model = "iPhone4";
-    }
-  } 
-  else 
-  {
-    model = "iPad";
-  }
-
-  var orientation = "portrait";
-  if (deviceOrientation == UIA_DEVICE_ORIENTATION_LANDSCAPELEFT) {
-    orientation = "landscapeleft";
-  } else if (deviceOrientation == UIA_DEVICE_ORIENTATION_LANDSCAPERIGHT) {
-    orientation = "landscaperight";
-  } else if (deviceOrientation == UIA_DEVICE_ORIENTATION_PORTRAIT_UPSIDEDOWN) {
-    orientation = "portrait_upsidedown";
-  }
-
-  var result = target.host().performTaskWithPathArgumentsTimeout("/usr/bin/printenv" , ["SNAPSHOT_LANGUAGE"], 5);
-  var language = result.stdout.substring(0, result.stdout.length - 1);
-
-  var parts = [language, model, name, orientation];
-  target.captureScreenWithName(parts.join("-"));
-}

data/lib/assets/snapshot.js

@@ -1,9 +0,0 @@
-#import "SnapshotHelper.js"
-
-var target = UIATarget.localTarget();
-var app = target.frontMostApp();
-var window = app.mainWindow();
-
-
-target.delay(3)
-captureLocalizedScreenshot("0-LandingScreen")

data/lib/snapshot/builder.rb

@@ -1,85 +0,0 @@
-module Snapshot
-  class Builder
-
-    def initialize
-      @build_dir = SnapshotConfig.shared_instance.build_dir || '/tmp/snapshot'
-    end
-
-    def build_app(clean: true)
-      FileUtils.rm_rf(@build_dir) if clean
-
-      command = SnapshotConfig.shared_instance.build_command
-
-      if not command
-        # That's the default case, user did not provide a custom build_command
-        raise "Could not find project. Please pass the path to your project using 'project_path'.".red unless SnapshotConfig.shared_instance.project_path
-        command = generate_build_command(clean: clean)
-      end
-
-      Helper.log.info "Building project '#{SnapshotConfig.shared_instance.project_name}' - this might take some time...".green
-      Helper.log.debug command.yellow
-
-      all_lines = []
-
-      PTY.spawn(command) do |stdin, stdout, pid|
-        stdin.each do |line|
-          all_lines << line
-          begin
-            parse_build_line(line) if line.length > 2
-          rescue => ex
-            Helper.log.fatal all_lines.join("\n")
-            raise ex
-          end
-        end
-        Process.wait(pid)
-      end
-      # Exit status for build command, should be 0 if build succeeded
-      cmdstatus = $?.exitstatus
-
-      if cmdstatus == 0 || all_lines.join('\n').include?('** BUILD SUCCEEDED **')
-        Helper.log.info "BUILD SUCCEEDED".green
-        return true
-      else
-        Helper.log.info(all_lines.join(' '))
-        raise "Looks like the build was not successful."
-      end
-    end
-
-    private
-      def parse_build_line(line)
-        if line.include?"** BUILD FAILED **"
-          raise line
-        end
-      end
-
-      def generate_build_command(clean: true)
-        scheme = SnapshotConfig.shared_instance.scheme
-
-        proj_path = SnapshotConfig.shared_instance.project_path
-        proj_key = 'project'
-        proj_key = 'workspace' if proj_path.end_with?'.xcworkspace'
-
-        pre_command = SnapshotConfig.shared_instance.custom_args || ENV["SNAPSHOT_CUSTOM_ARGS"] || ''
-        custom_build_args = SnapshotConfig.shared_instance.custom_build_args || ENV["SNAPSHOT_CUSTOM_BUILD_ARGS"] || ''
-        
-        build_command = pre_command + ' ' + (DependencyChecker.xctool_installed? ? 'xctool' : 'xcodebuild')
-
-        actions = []
-        actions << 'clean' if clean
-        actions << "build"
-
-        [
-          build_command,
-          "-sdk iphonesimulator",
-          "CONFIGURATION_BUILD_DIR='#{@build_dir}/build'",
-          "-#{proj_key} '#{proj_path}'",
-          "-scheme '#{scheme}'",
-          "DSTROOT='#{@build_dir}'",
-          "OBJROOT='#{@build_dir}'",
-          "SYMROOT='#{@build_dir}'",
-          custom_build_args,
-          actions.join(' ')
-        ].join(' ')
-      end
-  end
-end