ams_layout 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2d60bd2aadadbf95fa9452710ccaf583f84d830
-  data.tar.gz: 9bd0d333fcbb23bf21ad104be44159fd8e80ebf6
+  metadata.gz: 8906bc93ff556d7794f047aed24a6ffa22547f24
+  data.tar.gz: ccd43a30fb9ddfa0895df01b3852ae66880e7226
 SHA512:
-  metadata.gz: 19256e6f2d51c0c4aaf1a9f347a653a4d4e494369498182899f7dee3aaaef1d6ad1513f067201ce6f8bfda067e677ee21ddc6a8468b8e45307a349ce757232ed
-  data.tar.gz: 1068525e4c0c91248cb76a4787d2bf2017d9f8d69d85fd7eeb6db8d9e053094d981fc98a9267069464cdf3254cc672ff49a3952a289a48f8fd54bbd3198aa552
+  metadata.gz: 1eccda6b0a96f2bb2e906dc9c829af00b648b958f6f22202322c634d2f933eb42f1b5b67fe4fc6349915e9fc1e25cbe83af3253cb3c93c753dda7c1c575b7bb9
+  data.tar.gz: cc70f886bfacc1aa83a31be4f54ed98f686bcee0430e090f11c1231d330b0a12b076e23e154304d30d300d6a52441c48bd4727ef13d4fa7d253a9b18f0646bc6

data/.gitignore

@@ -11,8 +11,7 @@ lib/bundler/man
 pkg
 rdoc
 spec/reports
-test/tmp
-test/version_tmp
+/test/
 tmp
 *.bundle
 *.so

data/Rakefile

@@ -2,7 +2,7 @@ require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 require 'rake/clean'
 
-require_relative 'lib/ams_layout/browser_loader'
+require 'browser_loader'
 
 RSpec::Core::RakeTask.new(:spec)
 

data/ams_layout.gemspec

@@ -29,4 +29,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'ktutils'
   spec.add_runtime_dependency 'page-object'
   spec.add_runtime_dependency 'nokogiri'
+  spec.add_runtime_dependency 'browser_loader'
 end

data/lib/ams_layout.rb

@@ -189,7 +189,7 @@ end # AmsLayout
 AmsLayout.configure
 
 require "ams_layout/version"
-require "ams_layout/browser_loader"
+require "browser_loader"
 require 'ams_layout/client'
 require "ams_layout/parser"
 require "ams_layout/writer"

data/lib/ams_layout/pages.rb

@@ -7,12 +7,42 @@
 # Website::   http://ktechsystems.com
 ##############################################################################
 
-require 'ams_layout/browser_loader'
+require 'browser_loader'
 require 'ams_layout/pages/login_page'
 require 'ams_layout/pages/prequal_detail'
 
 module AmsLayout
   module Pages
+    class BrowserInst
+      @@browser = nil
+
+      ##
+      # Return a configured browser object. If a browser has already been created,
+      # this returns the existing browser.
+      #
+      # An +at_exit+ proc is created to close the browser when the program exits.
+
+      def self.browser
+        if ! open_browser?
+          BrowserLoader::Factory.browser_timeout = AmsLayout.configuration.browser_timeout
+          @@browser = BrowserLoader::Factory.build
+
+          at_exit do
+            unless ! open_browser?
+              # Make sure every webdriver window is closed.
+              @@browser.windows.each { |w| w.close rescue nil }
+              @@browser.close rescue nil
+            end
+          end
+        end
+
+        @@browser
+      end
+
+      def self.open_browser?
+        return (! @@browser.nil? && @@browser.exist? )
+      end
+    end
 
     ##
     # Return a configured browser object. If a browser has already been created,
@@ -21,16 +51,7 @@ module AmsLayout
     # An +at_exit+ proc is created to close the browser when the program exits.
 
     def browser
-      if @browser.nil?
-        BrowserLoader.user_data_path = AmsLayout.configuration.user_data_path
-        @browser = BrowserLoader.init_browser AmsLayout.configuration.browser_timeout
-
-        at_exit do
-          @browser.close unless @browser.nil?
-        end
-      end
-
-      @browser
+      BrowserInst.browser
     end
   end # Pages
 end # AmsLayout

data/lib/ams_layout/version.rb

@@ -1,3 +1,3 @@
 module AmsLayout
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/lib/ams_layout/client_spec.rb

@@ -11,6 +11,7 @@ describe AmsLayout::Client do
     if test_pwd.nil?
       fail "Set AMS_TEST_USER_PWD to the 'test' user's password in an environment variable"
     end
+    test_pwd
   }
 
   let(:layout_yml) {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ams_layout
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Jeff McAffee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-18 00:00:00.000000000 Z
+date: 2015-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -136,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: browser_loader
+  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'
 description: Generate AMS Portal control field configuration data
 email:
 - jeff@ktechsystems.com
@@ -156,7 +170,6 @@ files:
 - ams_layout.gemspec
 - bin/ams_layout
 - lib/ams_layout.rb
-- lib/ams_layout/browser_loader.rb
 - lib/ams_layout/cli.rb
 - lib/ams_layout/cli/config.rb
 - lib/ams_layout/cli/generate.rb

data/lib/ams_layout/browser_loader.rb

@@ -1,99 +0,0 @@
-##############################################################################
-# File::    browser_loader.rb
-# Purpose:: Create and initialize a browser with Watir
-# 
-# Author::    Jeff McAffee 06/21/2014
-# Copyright:: Copyright (c) 2014, kTech Systems LLC. All rights reserved.
-# Website::   http://ktechsystems.com
-##############################################################################
-
-require 'watir-webdriver'
-require 'ktutils/os'
-
-
-###
-# To start/stop Chrome auto-update, see http://blog.doofix.com/how-to-stop-google-chrome-from-automatic-update/
-#
-# Regedit instructions (in case URL breaks):
-#
-# Set value HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Google\Update\UpdateDefault to 0 to turn off auto-update.
-# Set to 1 to turn on auto-update, or delete the value (UpdateDefault).
-#
-
-###
-# Chromedriver updates can be downloaded from http://chromedriver.storage.googleapis.com/index.html
-#
-
-class BrowserLoader
-  def self.init_browser timeout = 60
-    if ENV["BROWSER"] == "ie"
-      browser = Watir::Browser.new :ie
-    elsif ENV["BROWSER"] == "ff" || ENV["BROWSER"] == "firefox"
-      browser = Watir::Browser.new :firefox
-    else
-      # Specify chrome browser capabilities.
-      caps = Selenium::WebDriver::Remote::Capabilities.chrome
-      caps['chromeOptions'] = {'binary' => chromium_exe }
-      #caps['chromeOptions'] = {'binary' => '/opt/bin/test/chrome-27.0.1453.94.exe' }
-      # See http://peter.sh/experiments/chromium-command-line-switches/ for a list of available switches.
-      # See https://sites.google.com/a/chromium.org/chromedriver/capabilities for details on setting ChromeDriver caps.
-
-      # NOTE: The only way I've found to stop the EULA from being displayed is to
-      # use the user-data-dir switch and point to a dir where chrome can put the
-      # data indicating it (EULA) has already been accepted.
-
-      # ignore-certificate-errors:  Ignores certificate-related errors.
-      # disable-popup-blocking:     Disable pop-up blocking.
-      # disable-translate:          Allows disabling of translate from the command line to assist with automated browser testing
-      # no-first-run:               Skip First Run tasks, whether or not it's actually the First Run.
-      # log-level:                  Sets the minimum log level. Valid values are from 0 to 3: INFO = 0, WARNING = 1, LOG_ERROR = 2, LOG_FATAL = 3.
-      # test-type:                  As of v35, chrome displays a message bar stating
-      #                               "You are using an unsupported command-line flag: --ignore-certifcate-errors. Stability and security will suffer."
-      #                               --test-type is supposed to disable the display of the error.
-      switches = %w[--ignore-certificate-errors --disable-popup-blocking --disable-translate --no-first-run --log-level=3 --test-type]
-      switches << "--user-data-dir=#{user_data_dir}"
-
-      # Create a client so we can adjust the timeout period.
-      client = Selenium::WebDriver::Remote::Http::Default.new
-
-      # Set the browser timeout. Default is 60 seconds.
-      client.timeout = timeout
-
-      # switches and caps modify chrome (or chromium) browser,
-      # service_args modifys chromedriver.
-      browser = Watir::Browser.new :chrome,
-        :switches => switches,
-        :http_client => client,
-        :service_log_path => user_data_dir + '/chromedriver.out',
-        :desired_capabilities => caps
-    end
-
-    browser
-  end
-
-  def self.user_data_path= path
-    @user_data_path = path
-  end
-
-  def self.user_data_dir
-    # Store chrome profile at chrome-data.
-    #user_data_dir = File.absolute_path(File.join(__FILE__, '../../../chrome-data'))
-    user_data_dir = File.absolute_path(@user_data_path)
-
-    fail "Chromium user-data directory does not exist at #{user_data_dir}" unless File.exist?(user_data_dir)
-
-    user_data_dir
-  end
-
-  def self.chromium_exe
-    if Ktutils::OS.windows?
-      # Downloaded from http://chromium.woolyss.com/
-      # Package: Chromium Package (32-bit)
-      # Version: 37.0.2011.0 (272392)
-      chromium_exe = File.absolute_path(File.join(__FILE__, '../../bin/chrome-win32/chrome.exe'))
-    else
-      chromium_exe = `which chromium-browser`.chomp
-    end
-  end
-end # BrowserLoader
-