skeleton-ui 0.1.9 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d327f051ce08a8b54de5154544b9204b196f132cd3383c0a40d0a0576294fadd
-  data.tar.gz: 5af318dbb05d21de9519fc1ca0127a68ed01f299a2a0d499d7acd7f69fb35b89
+  metadata.gz: 129ebeb0d1f8014b655ec386cc47546974bceb1b3d7117e51b94ce08235045ff
+  data.tar.gz: a3ec2f542d04712de55bd079dfa96770817c96aac239951ea2fe58a55bfe9cc7
 SHA512:
-  metadata.gz: 3dc4568e47c23add94d82ea95a2afa6babee5db570222d6bb0471e3e1e0fbac889a740b5a150a239f1ce19ca234f1e75bb96156c2df96a27e027f571bc755cb6
-  data.tar.gz: f23c839cac2dd2d9d21f54fae4e7c02602cabc34401c793e158bf9a3ac64887a17872916b9c446b244de97c44e1ace2f5cdde41f188ffa100bc5f3323e65f303
+  metadata.gz: af6e514ead6d99c5636eaf54bce53d8288279d6f7b0a68674ae613b226b87077631a9bcca36dbfda676a0516782cf338a56b10ccad03364f55d97a2187af6084
+  data.tar.gz: d7aa3d27c079ea9e084e16e10ebe8f7abb10c9adc4619649c8bdb32f02e0e55d87aab665bf0aa9c0de98a36023f5a18f4798e06bf58cf94c18d8c86e97d18eb8

data/README.md

@@ -92,6 +92,7 @@ Docs:
 ------
 
 - [Setting up Skeleton for working with iOS real devices](https://github.com/forqa/skeleton/blob/master/docs/real-ios-device-config.md)
+- [Setting up RVM for deciding permissions problems](https://github.com/alter-al/skeleton/blob/master/docs/permissions_error.md)
 
 ## License
 

data/bin/skeleton

@@ -3,6 +3,7 @@
 require 'commander/import'
 require_relative '../lib/skeleton'
 require_relative '../lib/skeleton/root'
+require_relative '../lib/skeleton/logger'
 
 module Skeleton
 	program :version, VERSION
@@ -27,9 +28,8 @@ module Skeleton
 	  c.description = 'Clear user cache'
 	  c.example 'description', 'skeleton clear'
 	  c.action do |_args, _options|
-			base = Base.new
-	    base.clear
-	    base.log.info("Successfully clear user cache")
+      Base.new.clear
+      Log.info('Successfully clear user cache')
 	  end
 	end
 
@@ -40,7 +40,7 @@ module Skeleton
 		c.option '-p', '--port PORT', String, 'Set web-server port'
 		c.action do |_args, options|
 			options.default(port: 4567)
-			system("ruby #{Base::ROOT_DIR}/html/server.rb #{options.port}")
+			system("ruby #{Base::ROOT_DIR}/server/server.rb #{options.port}")
 		end
 	end
 end

data/lib/skeleton.rb

@@ -1,12 +1,12 @@
 require 'erb'
 require 'fileutils'
 require 'nokogiri'
-require 'logger'
 require 'colorize'
 require 'mini_magick'
 require_relative 'skeleton/languages.rb'
 require_relative 'skeleton/root.rb'
 require_relative 'skeleton/version'
+require_relative 'skeleton/logger'
 require_relative 'skeleton/base'
 require_relative 'skeleton/ios'
 require_relative 'skeleton/android'
@@ -17,8 +17,6 @@ module Skeleton
 
 	  def initialize(options)
 	    self.platform = options.platform
-	    self.udid = options.udid
-	    self.bundle_id = options.bundle
 	    self.browser = options.browser
 	    @driver = ios? ? IOS.new(options) : Android.new(options)
 	  end
@@ -31,16 +29,6 @@ module Skeleton
 	    @platform = platform
 	  end
 
-	  def udid=(udid)
-      raise 'Not set udid [-u arg]' if udid.nil?
-	    @udid = udid
-	  end
-
-	  def bundle_id=(bundle_id)
-      raise 'Not set bundle_id [-b arg]' if @platform == 'ios' && bundle_id.nil?
-	    @bundle_id = bundle_id
-	  end
-
     def run
 			@driver.clear
 			@driver.precondition
@@ -63,9 +51,9 @@ module Skeleton
           @elements_tree.gsub!('<', '&lt;')
           @elements_tree.gsub!('>', '&gt;')
         end
-				template = File.read("#{Base::ROOT_DIR}/html/template.html.erb")
+				template = File.read("#{Base::ROOT_DIR}/server/template.html.erb")
 				result = ERB.new(template).result(binding)
-				File.open("#{Base::ROOT_DIR}/html/#{lang}.html", 'w+') { |f| f.write(result) }
+				File.open("#{Base::ROOT_DIR}/server/#{lang}.html", 'w+') { |f| f.write(result) }
 			end
     end
 
@@ -73,19 +61,20 @@ module Skeleton
       screenshot = Dir["#{Base::ATTACHMENTS_FOLDER}/*.png"].first
       image = MiniMagick::Image.new(screenshot)
       image.rotate(90) if image.width > image.height
-    rescue MiniMagick::Error => e
-      @driver.log.error(e)
+    rescue MiniMagick::Error => err
+      Log.warn(err)
 		ensure
-			FileUtils.cp_r(screenshot, "#{Base::ROOT_DIR}/html/screenshot.png")
+			FileUtils.cp_r(screenshot, "#{Base::ROOT_DIR}/server/screenshot.png")
     end
 
 		def open_url
-      port = File.read("#{Base::ROOT_DIR}/html/port")
+      port = File.read("#{Base::ROOT_DIR}/server/port")
 			url = "http://localhost:#{port}/skeleton"
 			`open #{url}` if @browser
-			@driver.log.info("Look at your pretty page objects: \n#{url} 😍")
-    rescue Errno::ENOENT => err
-      @driver.log.error("Something went wrong with skeleton server 💩\n#{err}")
+			Log.info("Look at your pretty page objects: \n#{url} 😍")
+    rescue Errno::ENOENT
+      Log.warn('Something went wrong with skeleton server 💩' \
+							 "\nTry to rerun it (:")
 		end
 
 	  def ios?

data/lib/skeleton/android.rb

@@ -16,20 +16,24 @@ class Android < Base
     python: :find_element_by_xpath
   }.freeze
 
-  attr_accessor :platform, :udid
+  attr_accessor :udid
 
   def initialize(options)
-    self.platform = options.platform
     self.udid = options.udid
     @language = Language.new
   end
 
   def skeletoner
-    log.info('We starting to skeleton your screen 🚀')
+    check_udid
+    Log.info('We starting to skeleton your screen 🚀')
     create_page_objects
     save_screenshot
     save(code: page_source)
-    log.info('We successfully skeletoned your screen 👻')
+    Log.info('We successfully skeletoned your screen 👻')
+  end
+
+  def devices
+    `adb devices`.scan(/\n(.*)\t/).flatten
   end
 
   private
@@ -55,7 +59,7 @@ class Android < Base
       end
       i += 1
     end
-    locator = "//#{line[CLASS]}[@#{CONTENT_DESC}='#{line[CONTENT_DESC]}]']"
+    locator = "//#{line[CLASS]}[@#{CONTENT_DESC}='#{line[CONTENT_DESC]}']]"
     code_generation(method_name: method_name,
                     locator_type: XPATH,
                     locator_value: locator)
@@ -74,7 +78,7 @@ class Android < Base
       end
       i += 1
     end
-    locator = "//#{line[CLASS]}[@#{TEXT}='#{text}]'"
+    locator = "//#{line[CLASS]}[@#{TEXT}='#{text}']"
     code_generation(method_name: method_name,
                     locator_type: XPATH,
                     locator_value: locator)
@@ -91,7 +95,7 @@ class Android < Base
   end
 
   def create_page_objects
-    log.info('Generation page objects for your awesome language 💪')
+    Log.info('Generation page objects for your awesome language 💪')
     page_source_html = Nokogiri::HTML.parse(page_source)
     page_source_html.css('node').each { |line| create_locator(line) }
   end
@@ -117,23 +121,33 @@ class Android < Base
 
   def page_source
     unless @page_source
-      log.info('Getting screen source tree ⚒')
+      Log.info('Getting screen source tree ⚒')
       dump = `adb -s #{@udid} shell uiautomator dump | egrep -o '/.*?xml'`
       @page_source = `adb -s #{@udid} shell cat #{dump}`
       if @page_source.empty?
-        log.fatal('Something went wrong. Check your device')
-        Process.exit(1)
+        Log.error('Something went wrong. Check your device')
       end
-      log.info('Successfully getting Screen Source Tree 🔥')
+      Log.info('Successfully getting Screen Source Tree 🔥')
     end
     @page_source
   end
 
   def save_screenshot
-    log.info('Saving screenshot 📷')
-    file_name = "#{@platform}_#{TIMESTAMP}.png"
+    Log.info('Saving screenshot 📷')
+    file_name = "android_#{TIMESTAMP}.png"
     `adb -s #{@udid} shell screencap -p /sdcard/#{file_name}`
     `adb -s #{@udid} pull /sdcard/#{file_name} #{ATTACHMENTS_FOLDER}/`
     `adb -s #{@udid} shell rm /sdcard/#{file_name}`
   end
+
+  def check_udid
+    Log.info('Checking device udid 👨‍💻')
+    @udid = devices.first if @udid.nil? && devices.size == 1
+    return if devices.include?(@udid)
+    if @udid.nil?
+      Log.error("Provide device udid [-u]")
+    elsif !devices.include?(@udid)
+      Log.error("No such devices with udid: #{@udid}")
+    end
+  end
 end

data/lib/skeleton/base.rb

@@ -4,25 +4,20 @@ class Base
   TIMESTAMP = (Time.now.to_f * 1000).to_i
 
   def precondition
-    create_logger
     clear
-    FileUtils.rm_rf("#{ROOT_DIR}/html/screenshot.png")
+    FileUtils.rm_rf("#{ROOT_DIR}/server/screenshot.png")
     FileUtils.mkdir_p(PAGE_OBJECTS_FOLDER)
     FileUtils.mkdir_p(ATTACHMENTS_FOLDER)
   rescue
-    log.fatal("Advice you to use not system ruby \n" \
+    Log.error("Advice you to use not system ruby \n" \
               'For more info read: https://github.com/alter-al/' \
               'skeleton/blob/master/docs/permissions_error.md')
-    raise
-  end
-
-  def log
-    create_logger if @log.nil?
-    @log
   end
 
   def skeletoner; end
 
+  def devices; end
+
   def clear
     FileUtils.rm_rf(PAGE_OBJECTS_FOLDER)
     FileUtils.rm_rf(ATTACHMENTS_FOLDER)
@@ -35,14 +30,6 @@ class Base
     File.open(file_path, 'a') { |f| f.write(code) }
   end
 
-  def create_logger
-    @log = Logger.new(STDOUT)
-    @log.level = Logger::INFO
-    @log.formatter = proc do |severity, datetime, _progname, msg|
-      "[#{severity}] #{datetime}: " + "#{msg}\n".colorize(:light_cyan)
-    end
-  end
-
   def snake_style(method_name)
     method_name
       .tr("@()[]'\"*!?{}:;#$^.,\/\\", '')

data/lib/skeleton/ios.rb

@@ -16,28 +16,36 @@ class IOS < Base
   XCRESULTS_FOLDER = "#{ROOT_DIR}/XCResults".freeze
   XCODEPROJ_FOLDER = "#{ROOT_DIR}/xcodeproj".freeze
 
-  attr_accessor :platform, :udid, :bundle_id
+  attr_accessor :udid, :bundle_id
 
   def initialize(options)
-    self.platform = options.platform
     self.udid = options.udid
     self.bundle_id = options.bundle
     @language = Language.new
   end
 
   def skeletoner
-    log.info('We starting to skeleton your screen 🚀')
     check_udid
     check_bundle
+    Log.info('We starting to skeleton your screen 🚀')
     page_source
     create_page_objects
     save_screenshot
     save(code: page_source)
-    log.info('We successfully skeletoned your screen 👻')
+    Log.info('We successfully skeletoned your screen 👻')
+  end
+
+  def devices
+    `idevice_id -l`.split.uniq.map { |d| d }
   end
 
   private
 
+  def bundle_id=(bundle_id)
+    raise 'Not set bundle_id [-b arg]' if bundle_id.nil?
+    @bundle_id = bundle_id
+  end
+
   def create_locator(line)
     locator_by_id = locator_by_id(line)
     locator_by_label = locator_by_label(line)
@@ -65,7 +73,7 @@ class IOS < Base
   end
 
   def create_page_objects
-    log.info('Generation page objects for your awesome language 💪')
+    Log.info('Generation page objects for your awesome language 💪')
     page_source.each_line do |line|
       break if line.include?(' StatusBar, ')
       next  if line.include?('Application, ')
@@ -123,7 +131,7 @@ class IOS < Base
 
   def page_source
     if @page_source.nil?
-      log.info('Getting screen source tree ⚒')
+      Log.info('Getting screen source tree ⚒')
       FileUtils.rm_rf(XCRESULTS_FOLDER)
       start_grep = 'start_grep_tag'
       end_grep = 'end_grep_tag'
@@ -138,27 +146,16 @@ class IOS < Base
       @page_source.slice!(start_grep)
       @page_source.slice!(end_grep)
       if @page_source.empty?
-        log.fatal("Try to sign Skeleton and SkeletonUI targets in " \
+        Log.error("Try to sign Skeleton and SkeletonUI targets in " \
                   "#{XCODEPROJ_FOLDER}/Skeleton.xcodeproj \n" \
                   'For more info read: https://github.com/alter-al/' \
                   'skeleton/blob/master/docs/real-ios-device-config.md')
-        raise
       end
-      log.info('Successfully getting Screen Source Tree 🔥')
+      Log.info('Successfully getting Screen Source Tree 🔥')
     end
     @page_source
   end
 
-  def check_udid
-    return unless @simulator.nil?
-    log.info('Checking iOS UDID 👨‍💻')
-    simulators = `xcrun simctl list`
-    @simulator = simulators.include?(@udid)
-    return if @simulator || `instruments -s devices`.include?(@udid)
-    log.fatal("No such devices with UDID: #{@udid}")
-    raise
-  end
-
   def check_bundle
     if @simulator
       return if `xcrun simctl appinfo #{@udid} #{@bundle_id}`
@@ -167,16 +164,26 @@ class IOS < Base
       return if `ideviceinstaller -u #{@udid} -l`
                     .include?("#{@bundle_id},")
     end
-    log.fatal("No such apps with bundle_id: #{@bundle_id}")
-    raise
+    Log.error("No such apps with bundle_id: #{@bundle_id}")
   end
 
   def save_screenshot
-    log.info('Saving screenshot 📷')
+    Log.info('Saving screenshot 📷')
     png_path = "#{XCRESULTS_FOLDER}/Attachments/*.png"
-    new_path = "#{ATTACHMENTS_FOLDER}/#{@platform}_#{TIMESTAMP}.png"
+    new_path = "#{ATTACHMENTS_FOLDER}/ios_#{TIMESTAMP}.png"
     screenshots = Dir[png_path].collect { |png| File.expand_path(png) }
     FileUtils.cp(screenshots[0], new_path)
     FileUtils.rm_rf(XCRESULTS_FOLDER)
   end
+
+  def check_udid
+    return unless @simulator.nil?
+    Log.info('Checking device udid 👨‍💻')
+    @simulator = `xcrun simctl list`.include?(@udid) unless @udid.nil?
+    @udid = devices.first if @udid.nil? && devices.size == 1
+    Log.error("Provide device udid [-u]") if @udid.nil?
+    unless @simulator || devices.include?(@udid)
+      Log.error("No such devices with udid: #{@udid}")
+    end
+  end
 end

data/lib/skeleton/logger.rb

@@ -0,0 +1,14 @@
+class Log
+  def self.info(message)
+    puts "[INFO] #{Time.now}: #{message}".colorize(:light_cyan)
+  end
+
+  def self.warn(message)
+    puts "[WARN] #{Time.now}: #{message}".colorize(:light_yellow)
+  end
+
+  def self.error(message)
+    puts "[ERROR] #{Time.now}: #{message}".colorize(:light_red)
+    Process.exit(1)
+  end
+end

data/lib/skeleton/root.rb

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

data/lib/skeleton/version.rb

@@ -1,4 +1,4 @@
 module Skeleton
-  VERSION = '0.1.9'
-  GEM_NAME = 'skeleton-ui'
+  VERSION ||= '0.1.11'.freeze
+  GEM_NAME ||= 'skeleton-ui'.freeze
 end

data/{html → server}/server.rb

@@ -4,7 +4,7 @@ require_relative '../lib/skeleton/root'
 server_port = ARGV[0]
 set :port, server_port
 
-File.open("#{Base::ROOT_DIR}/html/port", 'w+') { |f| f.write(server_port) }
+File.open("#{Base::ROOT_DIR}/server/port", 'w+') { |f| f.write(server_port) }
 
 get '/' do
   redirect "skeleton"
@@ -13,11 +13,11 @@ end
 get '/:file' do
   domain = params[:file].split('.').last
   file = domain == params[:file] ? "#{domain}.html" : params[:file]
-  send_file "#{Base::ROOT_DIR}/html/#{file}"
+  send_file "#{Base::ROOT_DIR}/server/#{file}"
 end
 
 post '/:file' do
   domain = params[:file].split('.').last
   file = domain == params[:file] ? "#{domain}.html" : params[:file]
-  send_file "#{Base::ROOT_DIR}/html/#{file}"
+  send_file "#{Base::ROOT_DIR}/server/#{file}"
 end

data/xcodeproj/Skeleton.xcodeproj/project.pbxproj

@@ -354,7 +354,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = 4D6LA585PP;
+				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = Skeleton/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
@@ -370,7 +370,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = 4D6LA585PP;
+				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = Skeleton/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
@@ -386,7 +386,7 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = 4D6LA585PP;
+				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = SkeletonUITests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = ru.forqa.SkeletonUITests;
@@ -402,7 +402,7 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = 4D6LA585PP;
+				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = SkeletonUITests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = ru.forqa.SkeletonUITests;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skeleton-ui
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.11
 platform: ruby
 authors:
 - a.alterpesotskiy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-27 00:00:00.000000000 Z
+date: 2018-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -161,17 +161,18 @@ files:
 - docs/real-ios-device-config.md
 - docs/sign_xcproj.png
 - docs/untrusted-dev.png
-- html/index.css
-- html/server.rb
-- html/skeleton.html
-- html/template.html.erb
 - lib/skeleton.rb
 - lib/skeleton/android.rb
 - lib/skeleton/base.rb
 - lib/skeleton/ios.rb
 - lib/skeleton/languages.rb
+- lib/skeleton/logger.rb
 - lib/skeleton/root.rb
 - lib/skeleton/version.rb
+- server/index.css
+- server/server.rb
+- server/skeleton.html
+- server/template.html.erb
 - skeleton.gemspec
 - xcodeproj/Skeleton.xcodeproj/project.pbxproj
 - xcodeproj/Skeleton.xcodeproj/project.xcworkspace/contents.xcworkspacedata