skeleton-ui 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c61822adcde99dd0dafee9f319f32e6fca287f21828f107f72397dace1fd9fa9
-  data.tar.gz: 8d128eaa42755df0ca0e1350b4968607e60152eea74eb5faa56fcd01615178b9
+  metadata.gz: d327f051ce08a8b54de5154544b9204b196f132cd3383c0a40d0a0576294fadd
+  data.tar.gz: 5af318dbb05d21de9519fc1ca0127a68ed01f299a2a0d499d7acd7f69fb35b89
 SHA512:
-  metadata.gz: 30127746a98bacdaf1fbde004ad3dde942e89165e5029fd671771168e9568a6daa215d312ad3035e173536feae0ab6f6e0970035c24a303001226bcfc72ec828
-  data.tar.gz: ec5daea8898e03da127a206aa88f272adf43e64d6fecf33587f1f5b1ea9415e28ae4c975dfdeb958a14397fc727bbe2afdc1b6ede8395001ee6a1fe40f8bac08
+  metadata.gz: 3dc4568e47c23add94d82ea95a2afa6babee5db570222d6bb0471e3e1e0fbac889a740b5a150a239f1ce19ca234f1e75bb96156c2df96a27e027f571bc755cb6
+  data.tar.gz: f23c839cac2dd2d9d21f54fae4e7c02602cabc34401c793e158bf9a3ac64887a17872916b9c446b244de97c44e1ace2f5cdde41f188ffa100bc5f3323e65f303

data/.gitignore

@@ -9,5 +9,5 @@
 *.xcuserdatad
 *.png
 *.html
-!index.html
+!skeleton.html
 port

data/README.md

@@ -67,6 +67,9 @@ Usage:
             
             -b, --bundle BUNDLE
             Set Bundle ID for your app [required for iOS]
+            
+            --[no-]browser
+            Not open the browser at the end of skeleton's work
         
         $ skeleton clear --help
             

data/bin/skeleton

@@ -15,7 +15,9 @@ module Skeleton
 	  c.option '-p', '--platform PLATFORM', String, 'Set device platform: android or ios'
 	  c.option '-u', '--udid UDID', String, 'Set device UDID'
 	  c.option '-b', '--bundle BUNDLE', String, 'Set Bundle ID for your app [required for iOS]'
+	  c.option '--[no-]browser', "Not open the browser at the end of skeleton's work"
 	  c.action do |_args, options|
+			options.default(browser: true)
 	    Skeleton.new(options).run
 	  end
 	end

data/docs/permissions_error.md

@@ -0,0 +1,8 @@
+## Setting up Ruby Version Manager for deciding permissions problems
+
+1. Install rvm (\curl -sSL https://get.rvm.io | bash -s stable).
+2. Check that rvm is available from terminal (which rvm). If not, set it in your .bash_profile.
+3. Install latest ruby via rvm (rvm install ruby).
+4. Set default ruby from rvm, instead of system ruby (rvm --default <version>).
+5. Make sure, that you use latest ruby from rvm (ruby -v).
+6. Reinstall skeleton without sudo (gem install skeleton-ui).

data/html/server.rb

@@ -6,10 +6,18 @@ set :port, server_port
 
 File.open("#{Base::ROOT_DIR}/html/port", 'w+') { |f| f.write(server_port) }
 
+get '/' do
+  redirect "skeleton"
+end
+
 get '/:file' do
-  send_file "#{Base::ROOT_DIR}/html/#{params[:file]}"
+  domain = params[:file].split('.').last
+  file = domain == params[:file] ? "#{domain}.html" : params[:file]
+  send_file "#{Base::ROOT_DIR}/html/#{file}"
 end
 
 post '/:file' do
-  send_file "#{Base::ROOT_DIR}/html/#{params[:file]}"
+  domain = params[:file].split('.').last
+  file = domain == params[:file] ? "#{domain}.html" : params[:file]
+  send_file "#{Base::ROOT_DIR}/html/#{file}"
 end

data/html/{index.html → skeleton.html}

@@ -15,15 +15,14 @@
 			<div class="row" style="min-height: 333px;">
 				<div class="col-md-8">
 					<h2>Get it:</h2>
-					<li><a href="ruby.html">Ruby</a></li>
-					<li><a href="java.html">Java</a></li>
-					<li><a href="python.html">Python</a></li>
-					<li><a href="javascript.html">Javascript</a></li>
+					<li><a href="ruby">Ruby</a></li>
+					<li><a href="java">Java</a></li>
+					<li><a href="python">Python</a></li>
+					<li><a href="javascript">Javascript</a></li>
 				</div>
 			</div>
 			<footer class="my-5 pt-5 text-muted text-center text-small">
-				<p class="mb-1">© 2018 <a href="https://github.com/forqa">forqa</a></p>
-				<p class="mb-1"><a href="https://github.com/alter-al">alter-al</a></p>
+				<p class="mb-1">© 2018 <a href="https://github.com/alter-al">alter-al</a></p>
 				<ul class="list-inline"></ul>
 			</footer>
 		</div>

data/html/template.html.erb

@@ -7,6 +7,7 @@
     <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.0/css/bootstrap.min.css" integrity="sha384-9gVQ4dYFwwWSjIDZnLEWnxCjeSWFphJiwGPXr1jddIhOegiu1FwO5qRGvFXOdJZ4" crossorigin="anonymous">
     <link rel="stylesheet" type="text/css" href="/index.css"/>
   </head>
+  <a href="skeleton">&#8592 home</a>
   <body class="bg-light" style="background: linear-gradient(white, lightblue);">
     <div class="container-fluid">
       <div class="py-5 text-center">
@@ -19,9 +20,9 @@
           </div>
         </div>
         <div class="col-md-8">
-          <h4 class="mb-3">Page Objects:</h4>
+          <h4 class="mb-3">Screen Objects:</h4>
           <div class="content" id="content" style="max-height: 670px; overflow-y: auto;">
-            <pre><code><%= @pageobject %></code></pre>
+            <pre><code><%= @screen_objects %></code></pre>
           </div>
         </div>
         <div class="col-md-12">
@@ -32,9 +33,8 @@
         </div>
       </div>
       <footer class="my-2 pt-5 text-muted text-small">
-        <p class="mb-1 text-center">© 2018 <a href="https://github.com/forqa">forqa</a></p>
-        <p class="mb-1 text-center"><a href="https://github.com/alter-al">alter-al</a></p>
-        <p class="mb-1 text-right"><a href="https://github.com/forqa/skeleton/releases/tag/<%= @build_version %>"><%= @build_version %></a></p>
+        <p class="mb-1 text-center">© 2018 <a href="https://github.com/alter-al">alter-al</a></p>
+        <p class="mb-1 text-right"><a href="https://github.com/alter-al/skeleton/releases/tag/<%= @build_version %>"><%= @build_version %></a></p>
       </footer>
     </div>
   </body>

data/lib/skeleton.rb

@@ -13,12 +13,13 @@ require_relative 'skeleton/android'
 
 module Skeleton
 	class Skeleton
-	  attr_accessor :platform, :udid, :bundle_id
+	  attr_accessor :platform, :udid, :bundle_id, :browser
 
 	  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
 
@@ -54,7 +55,7 @@ module Skeleton
         attach_image
 				type = language.type(lang)
         folder = Base::PAGE_OBJECTS_FOLDER
-				@pageobject = File.read(Dir["#{folder}/*.#{type}"].first)
+				@screen_objects = File.read(Dir["#{folder}/*.#{type}"].first)
 				@elements_tree = File.read(Dir["#{folder}/*.xml"].first)
 				@build_version = "v#{VERSION}"
         if @driver.class == Android
@@ -72,15 +73,16 @@ 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, "#{Base::ROOT_DIR}/html/screenshot.png")
     rescue MiniMagick::Error => e
       @driver.log.error(e)
+		ensure
+			FileUtils.cp_r(screenshot, "#{Base::ROOT_DIR}/html/screenshot.png")
     end
 
 		def open_url
       port = File.read("#{Base::ROOT_DIR}/html/port")
-			url = "http://localhost:#{port}/index.html"
-			`open #{url}`
+			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}")

data/lib/skeleton/base.rb

@@ -9,6 +9,11 @@ class Base
     FileUtils.rm_rf("#{ROOT_DIR}/html/screenshot.png")
     FileUtils.mkdir_p(PAGE_OBJECTS_FOLDER)
     FileUtils.mkdir_p(ATTACHMENTS_FOLDER)
+  rescue
+    log.fatal("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

data/lib/skeleton/ios.rb

@@ -138,9 +138,10 @@ class IOS < Base
       @page_source.slice!(start_grep)
       @page_source.slice!(end_grep)
       if @page_source.empty?
-        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')
+        log.fatal("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 🔥')
@@ -164,7 +165,7 @@ class IOS < Base
                     .include?("CFBundleName")
     else
       return if `ideviceinstaller -u #{@udid} -l`
-                    .include?(@bundle_id)
+                    .include?("#{@bundle_id},")
     end
     log.fatal("No such apps with bundle_id: #{@bundle_id}")
     raise

data/lib/skeleton/version.rb

@@ -1,4 +1,4 @@
 module Skeleton
-  VERSION = '0.1.8'
+  VERSION = '0.1.9'
   GEM_NAME = 'skeleton-ui'
 end

data/xcodeproj/Skeleton.xcodeproj/project.pbxproj

@@ -354,7 +354,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = "";
+				DEVELOPMENT_TEAM = 4D6LA585PP;
 				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 = "";
+				DEVELOPMENT_TEAM = 4D6LA585PP;
 				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 = "";
+				DEVELOPMENT_TEAM = 4D6LA585PP;
 				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 = "";
+				DEVELOPMENT_TEAM = 4D6LA585PP;
 				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.8
+  version: 0.1.9
 platform: ruby
 authors:
 - a.alterpesotskiy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-18 00:00:00.000000000 Z
+date: 2018-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -157,12 +157,13 @@ files:
 - bin/console
 - bin/setup
 - bin/skeleton
+- docs/permissions_error.md
 - docs/real-ios-device-config.md
 - docs/sign_xcproj.png
 - docs/untrusted-dev.png
 - html/index.css
-- html/index.html
 - html/server.rb
+- html/skeleton.html
 - html/template.html.erb
 - lib/skeleton.rb
 - lib/skeleton/android.rb