snapshot 0.4.8 → 0.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb22e301c8b01a884a5a8c28d667c7232aec7aac
-  data.tar.gz: ade29b593ed655a723842b8a5a29adab0ec9edd2
+  metadata.gz: eabaebc955a15edd3112f25763bfb7d4f739d8b1
+  data.tar.gz: a659b2cab87ab71c921ec6bfa01e926576fc98fc
 SHA512:
-  metadata.gz: 77e1b8abec203b2821de66c104e0327abd5d4bc07f716dc07494ded8910b364f66c08038a32f839e0164270ea1bacc0b920b392d4eb7cfb8b352d20fa25397ce
-  data.tar.gz: b46801b442b87817743e93575b2f24453ca3fa2851641632cd00aca4ed82b23c34f787c5574f209a136455a69b8c04a6ade27d45af2a53c62c70fbbbe5e3dc8e
+  metadata.gz: 1fc1971391f58ec8c4dbec7f98e485822fa7f4ce7e09bd569e1cbbf8f6d464e28a93ee3a2612ec0d3d979c517c9774af47fbdd7a00244efa2c3899d2bf2832cd
+  data.tar.gz: fce288bbb2822a369275d0fb08ed29da5ec2439ef0aa51c7fa5531dd4761a09feab7d8135a50e172e821c72545bfcf3fc2d3fe363f03c87fc2d554603cfd2a96

data/lib/assets/snapshot.js

@@ -6,8 +6,4 @@ var window = app.mainWindow();
 
 
 target.delay(3)
-captureLocalizedScreenshot("0-LandingScreen")
-
-target.frontMostApp().tabBar().buttons()[1].tap();
-target.delay(1)
-captureLocalizedScreenshot("1-SecondScreen")
+captureLocalizedScreenshot("0-LandingScreen")

data/lib/snapshot.rb

@@ -1,6 +1,4 @@
-require 'json'
 require 'snapshot/version'
-require 'snapshot/helper'
 require 'snapshot/snapshot_config'
 require 'snapshot/runner'
 require 'snapshot/builder'
@@ -9,13 +7,13 @@ require 'snapshot/reports_generator'
 require 'snapshot/screenshot_flatten'
 require 'snapshot/screenshot_rotate'
 require 'snapshot/simulators'
-require 'snapshot/update_checker'
 require 'snapshot/dependency_checker'
 
-# Third Party code
-require 'colored'
+require 'fastlane_core'
 
 module Snapshot
-  Snapshot::UpdateChecker.verify_latest_version
+  Helper = FastlaneCore::Helper # you gotta love Ruby: Helper.* should use the Helper class contained in FastlaneCore
+
+  FastlaneCore::UpdateChecker.verify_latest_version('snapshot', Snapshot::VERSION)
   Snapshot::DependencyChecker.check_dependencies
 end

data/lib/snapshot/dependency_checker.rb

@@ -11,11 +11,11 @@ module Snapshot
     def self.check_xcode_select
       unless `xcode-select -v`.include?"xcode-select version "
         Helper.log.fatal '#############################################################'
-        Helper.log.fatal "# You have to install the Xcode commdand line tools to use deliver"
+        Helper.log.fatal "# You have to install the Xcode commdand line tools to use snapshot"
         Helper.log.fatal "# Install the latest version of Xcode from the AppStore"
         Helper.log.fatal "# Run xcode-select --install to install the developer tools"
         Helper.log.fatal '#############################################################'
-        raise "Run 'xcode-select --install' and start deliver again"
+        raise "Run 'xcode-select --install' and start snapshot again"
       end
     end
 
@@ -57,4 +57,4 @@ module Snapshot
       end
     end
   end
-end
+end

data/lib/snapshot/page.html.erb

@@ -40,11 +40,14 @@
             <% screens.each do |screen_path| %>
               <% next if screen_path.include?"_framed.png" %>
               <td>
-                <% screen_size = FastImage.size(screen_path) %>
+                <% screen_size = FastImage.size(File.join(SnapshotConfig.shared_instance.screenshots_path, screen_path)) %>
+                <% width = ((screen_size[0] / divide_size_by).round rescue 0) %>
+                <% width = [width, max_width].min %>
+                <% style = (width > 0 ? "width: #{width}px;" : '') %>
                 <a href="<%= screen_path %>" target="_blank">
                   <img class="screenshot" 
                          src="<%= screen_path %>",
-                       style="width: <%= [(screen_size[0] / divide_size_by).round, max_width].min %>px;" />
+                       style="<%= style %>" />
                 </a>
               </td>
             <% end %>

data/lib/snapshot/snapfile_creator.rb

@@ -1,5 +1,3 @@
-require 'snapshot/helper'
-
 module Snapshot
   class SnapfileCreator
     # This method will take care of creating a Snapfile
@@ -8,6 +6,7 @@ module Snapshot
 
       raise "Snapfile already exists at path '#{snapfile_path}'. Run 'snapshot' to use Snapshot.".red if File.exists?(snapfile_path)
 
+      gem_path = Helper.gem_path("snapshot")
       File.write(snapfile_path, File.read("#{gem_path}/lib/assets/SnapfileTemplate"))
       File.write([path, 'snapshot.js'].join('/'), File.read("#{gem_path}/lib/assets/snapshot.js"))
       File.write([path, 'snapshot-iPad.js'].join('/'), File.read("#{gem_path}/lib/assets/snapshot.js"))
@@ -18,14 +17,5 @@ module Snapshot
       puts "Successfully created new UI Automation JS file for iPad at '#{[path, 'snapshot-iPad.js'].join('/')}'".green
       puts "Successfully created new Snapfile at '#{snapfile_path}'".green
     end
-
-     private
-      def self.gem_path
-        if not Helper.is_test? and Gem::Specification::find_all_by_name('snapshot').any?
-          return Gem::Specification.find_by_name('snapshot').gem_dir
-        else
-          return './'
-        end
-      end
   end
 end

data/lib/snapshot/version.rb

@@ -1,3 +1,3 @@
 module Snapshot
-  VERSION = "0.4.8"
+  VERSION = "0.4.9"
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: snapshot
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.4.9
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-17 00:00:00.000000000 Z
+date: 2015-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: json
+  name: fastlane_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -24,62 +24,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: highline
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.6.21
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.6.21
-- !ruby/object:Gem::Dependency
-  name: colored
-  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: commander
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '4'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '4'
-- !ruby/object:Gem::Dependency
-  name: fastimage
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.6.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.6.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -181,7 +125,6 @@ files:
 - lib/snapshot.rb
 - lib/snapshot/builder.rb
 - lib/snapshot/dependency_checker.rb
-- lib/snapshot/helper.rb
 - lib/snapshot/page.html.erb
 - lib/snapshot/reports_generator.rb
 - lib/snapshot/runner.rb
@@ -191,7 +134,6 @@ files:
 - lib/snapshot/snapfile_creator.rb
 - lib/snapshot/snapshot_config.rb
 - lib/snapshot/snapshot_file.rb
-- lib/snapshot/update_checker.rb
 - lib/snapshot/version.rb
 homepage: http://fastlane.tools
 licenses:

data/lib/snapshot/helper.rb

@@ -1,55 +0,0 @@
-require 'logger'
-
-module Snapshot
-  class Helper
-
-
-    # Logging happens using this method
-    def self.log
-      if is_test?
-        @@log ||= Logger.new(STDOUT) # don't show any logs when running tests
-      else
-        @@log ||= Logger.new(STDOUT)
-      end
-
-      @@log.formatter = proc do |severity, datetime, progname, msg|
-        string = "#{severity} [#{datetime.strftime('%Y-%m-%d %H:%M:%S.%2N')}]: "
-        second = "#{msg}\n"
-
-        if severity == "DEBUG"
-          string = string.magenta
-        elsif severity == "INFO"
-          string = string.white
-        elsif severity == "WARN"
-          string = string.yellow
-        elsif severity == "ERROR"
-          string = string.red
-        elsif severity == "FATAL"
-          string = string.red.bold
-        end
-
-
-        [string, second].join("")
-      end
-
-      @@log
-    end
-
-    # @return true if the currently running program is a unit test
-    def self.is_test?
-      defined?SpecHelper
-    end
-
-    # @return the full path to the Xcode developer tools of the currently
-    #  running system
-    def self.xcode_path
-      return "" if self.is_test? and not OS.mac?
-      `xcode-select -p`.gsub("\n", '') + "/"
-    end
-
-    def self.fastlane_enabled?
-      # This is called from the root context on the first start
-      @@enabled ||= File.directory?"./fastlane"
-    end
-  end
-end

data/lib/snapshot/update_checker.rb

@@ -1,45 +0,0 @@
-require 'open-uri'
-
-module Snapshot
-  # Verifies, the user runs the latest version of this gem
-  class UpdateChecker
-    # This method will check if the latest version is installed and show a warning if that's not the case
-    def self.verify_latest_version
-      if self.update_available?
-        v = fetch_latest
-        puts '#######################################################################'.green
-        puts "# Snapshot #{v} is available.".green
-        puts "# It is recommended to use the latest version.".green
-        puts "# Update using '(sudo) gem update snapshot'.".green
-        puts "# To see what's new, open https://github.com/KrauseFx/snapshot/releases.".green
-        puts '#######################################################################'.green
-        return true
-      end
-      false
-    end
-
-    # Is a new official release available (this does not include pre-releases)
-    def self.update_available?
-      begin
-        latest = fetch_latest
-        if latest and Gem::Version.new(latest) > Gem::Version.new(current_version)
-          return true
-        end
-      rescue => ex
-        Helper.log.debug(ex)
-        Helper.log.error("Could not check if 'snapshot' is up to date.")
-      end
-      return false
-    end
-
-    # The currently used version of this gem
-    def self.current_version
-      Snapshot::VERSION
-    end
-
-    private
-      def self.fetch_latest
-        JSON.parse(open("http://rubygems.org/api/v1/gems/snapshot.json").read)["version"]
-      end
-  end
-end