skeleton-ui 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5058006d22b824cf0ee9c8301301d727ba7154d1bb9ddedb8bcb0de8499dd2d
-  data.tar.gz: f90ceeb4bc70f85cb31985ea8624ef46b160f3c4ceaa23fcb7a264db61768c2b
+  metadata.gz: 5257b8d04043400f487c2b9a77bbf8047de5b21374283add68698b1785a6224a
+  data.tar.gz: 32556ec05afce6349e8404780158349c6b97eb15591f723ba820e9f926fa055c
 SHA512:
-  metadata.gz: ddda2e82e23fea5f6fd934c1067277993ade7f4d76fccf4acf1fbb86aec41c6e6d99a09751b971c9a56a34424f691f0b10b05c777bf0f84f0f2e19479c9d56ec
-  data.tar.gz: 30da30b97b76e1a9b4a652fb1803f983177d6a7faf87a5d53571bc0e611cabfd3122021b7adb6fd7284aeea4383ff64b97096c0bf25559f601262f6fa069d75f
+  metadata.gz: 701ae03bf7beb1e3a8384c8685050cf62cc70c3fb624a6f97d3246054cd06d5407e9986a8b91721648848ad71d5ec10bb583281ffeff0b7ab9c99ec021454f67
+  data.tar.gz: ef0aecdff8b5aebda6744c51deb2b872352511989b0731cfd481692bed34270d064930bc3f29a27523e9d9261f26299fef17969b6b161f1998a1bc06ad2dba98

data/README.md

@@ -16,6 +16,7 @@ Prerequisites:
 #### iOS
 - Install [Xcode](https://developer.apple.com/xcode/download/).
 - Install [Xcode Command Line Tools](http://railsapps.github.io/xcode-command-line-tools.html).
+- Install [ideviceinstaller](http://brewformulas.org/Ideviceinstaller)
 
 Installation:
 ------

data/bin/skeleton

@@ -2,6 +2,7 @@
 
 require 'commander/import'
 require_relative '../lib/skeleton'
+require_relative '../lib/skeleton/root'
 
 module Skeleton
 	program :version, VERSION
@@ -37,7 +38,7 @@ module Skeleton
 		c.option '-p', '--port PORT', String, 'Set web-server port'
 		c.action do |_args, options|
 			options.default(port: 4567)
-			system("cd ../html/ && ruby server.rb #{options.port}")
+			system("ruby #{Base::ROOT_DIR}/html/server.rb #{options.port}")
 		end
 	end
-end
+end

data/html/server.rb

@@ -1,11 +1,12 @@
 require 'sinatra'
+require_relative '../lib/skeleton/root'
 
 set :port, ARGV[0]
 
 get '/:file' do
-  send_file params[:file]
+  send_file "#{Base::ROOT_DIR}/html/#{params[:file]}"
 end
 
 post '/:file' do
-  send_file params[:file]
+  send_file "#{Base::ROOT_DIR}/html/#{params[:file]}"
 end

data/lib/skeleton.rb

@@ -61,9 +61,9 @@ module Skeleton
           @elements_tree.gsub!('<', '&lt;')
           @elements_tree.gsub!('>', '&gt;')
         end
-				template = File.read('../html/template.html.erb')
+				template = File.read("#{Base::ROOT_DIR}/html/template.html.erb")
 				result = ERB.new(template).result(binding)
-				File.open("../html/#{lang}.html", 'w+') { |f| f.write(result) }
+				File.open("#{Base::ROOT_DIR}/html/#{lang}.html", 'w+') { |f| f.write(result) }
 			end
     end
 
@@ -71,7 +71,7 @@ module Skeleton
       screenshot = Dir["#{Base::ATTACHMENTS_FOLDER}/*.png"].first
       image = MiniMagick::Image.new(screenshot)
       image.rotate(90) if image.width > image.height
-      FileUtils.cp_r(screenshot, '../html/screenshot.png')
+      FileUtils.cp_r(screenshot, "#{Base::ROOT_DIR}/html/screenshot.png")
     rescue MiniMagick::Error => e
       @driver.log.error(e)
     end

data/lib/skeleton/ios.rb

@@ -28,6 +28,7 @@ class IOS < Base
   def skeletoner
     log.info('We starting to skeleton your screen 🚀')
     check_udid
+    check_bundle
     page_source
     create_page_objects
     save_screenshot
@@ -123,10 +124,9 @@ class IOS < Base
       @page_source.slice!(start_grep)
       @page_source.slice!(end_grep)
       if @page_source.empty?
-        log.fatal("Something went wrong.\n" \
-            "1. Try to sign Skeleton in #{XCODEPROJ_FOLDER}\n" \
-            "2. Check in the iOS settings that Skeleton is trust developer.\n" \
-            '3. Check your app bundle_id')
+        log.fatal("Try to sign Skeleton in #{XCODEPROJ_FOLDER}.\n" \
+                  'For more info read: https://github.com/forqa/skeleton/' \
+                  'blob/master/docs/real-ios-device-config.md')
         raise
       end
       log.info('Successfully getting Screen Source Tree 🔥')
@@ -144,6 +144,18 @@ class IOS < Base
     raise
   end
 
+  def check_bundle
+    if @simulator
+      return if `xcrun simctl appinfo #{@udid} #{@bundle_id}`
+                    .include?("CFBundleName")
+    else
+      return if `ideviceinstaller -u #{@udid} -l`
+                    .include?(@bundle_id)
+    end
+    log.fatal("No such apps with bundle_id: #{@bundle_id}")
+    raise
+  end
+
   def save_screenshot
     log.info('Saving screenshot 📷')
     png_path = "#{XCRESULTS_FOLDER}/Attachments/*.png"

data/lib/skeleton/root.rb

@@ -1,5 +1,7 @@
+require_relative 'version'
+
 class Base
-   ROOT_DIR = File.expand_path('..', Dir.pwd)
-   #ROOT_DIR = "#{`gem environment gemdir`.strip}" \
-   #             "/gems/#{Skeleton::GEM_NAME}-#{Skeleton::VERSION}"
+   # ROOT_DIR = File.expand_path('..', Dir.pwd)
+   ROOT_DIR = "#{`gem environment gemdir`.strip}" \
+               "/gems/#{Skeleton::GEM_NAME}-#{Skeleton::VERSION}"
 end

data/lib/skeleton/version.rb

@@ -1,4 +1,4 @@
 module Skeleton
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
   GEM_NAME = 'skeleton-ui'
 end

data/skeleton.gemspec

@@ -30,6 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "colorize", "~> 0.8.1"
   spec.add_dependency "mini_magick", "~> 4.8.0"
   spec.add_dependency "nokogiri", "~> 1.8.2"
+  spec.add_dependency "sinatra", "~> 2.0.3"
   spec.add_dependency "fileutils"
   spec.add_dependency "commander"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skeleton-ui
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - a.alterpesotskiy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-12 00:00:00.000000000 Z
+date: 2018-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.2
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.3
 - !ruby/object:Gem::Dependency
   name: fileutils
   requirement: !ruby/object:Gem::Requirement