selenium-prep 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9ad9e9fc87056fa9da1413bf86498adc5339d75
-  data.tar.gz: 327175318ebcb6c7ec24564811cab3f2ed800b4a
+  metadata.gz: fa3a1f4b9de0019d2a5ccf4665f381334314e1a5
+  data.tar.gz: ccd0dc7e1a75cab075fe973e524278df0c1a0cd6
 SHA512:
-  metadata.gz: 6b3b38a7cdd6882eb1c3384953f66c1775765332bd3e2b154c83cbb821ea57aec61e7c58f5a5fed8e2caa22c51fb3ff9bb5fb89c37730c5df21448b83f3e41b4
-  data.tar.gz: e490be978bca3cc4c432ee724bf066e82a10843025b91e9f8c4a2488b55c05d4d5e65b05c121872c2c47f43fda44128b54bddd140bff6588580c0bb671a75a13
+  metadata.gz: 6dbf642956127fe2c9ffe88015fe926a3b2812c12cb7c73311c7cb629c7e3ca268c59c873c59aebfbc11275c46a70d263973914866f3831ea07bd9a8e246bbfa
+  data.tar.gz: 7b9010f011b40f090e25bb16938a81e372cf044c8f27b474f0be3be37cd7d68ff0ac876007df95aa468d4bd96c6576666e27eef9ec52c4430485c9d643877993

data/README.txt

@@ -2,7 +2,7 @@
 
 == DESCRIPTION:
 
-selenium-prep helps set up your machine for local Selenium execution for multiple browsers. It downloads (in parallel) the latest browser drivers and standalone server to a specified location. It will then check your system PATH to see if the download directory is in it. If not, it will provide you with information on how to configure it for your operating system.
+selenium-prep helps set up your machine for local Selenium execution for multiple browsers. It downloads (in parallel) the latest browser drivers and standalone server to a specified location. It will then check your system PATH to see if the download directory is in it. If not, it will add it for you.
 
 == INSTALLATION:
 
@@ -12,11 +12,17 @@ gem install selenium-prep
 
 === Environment Variables
 
-SE_OS_TYPE (e.g., 'linux32', 'linux64', 'mac32', 'win32', 'win64')
+SE_OS_TYPE (e.g., 'linux32', 'linux64', 'mac32', 'win32', 'win64' -- automatically detected)
+SE_OS_TYPE_BIT (e.g., '32', '64' -- defaults to '32')
 SE_DOWNLOAD_LOCATION (e.g., full path)
-SE_DEBUG (e.g., 'off' to disable all standard output -- on by default)
 
-If these values are not set properly, a RuntimeError will be returned along with a helpful message.
+NOTE: SE_DOWNLOAD_LOCATION is the only variable you need to set. If is not set properly, a RuntimeError will be returned along with a helpful message.
+
+=== Prep
+
+SeleniumPrep.prep
+
+NOTE: This will download the files for your OS, attempt to set the path on your system, and check that the path is set correctly. If not, it will provide some debugging output.
 
 === Downloading
 
@@ -26,11 +32,11 @@ NOTE: The downloader will check to see if the download directory is empty. If no
 
 === Check System Path
 
-Find out if your path is set correctly and if not provide instructions on how to proceed.
+Find out if your path is set correctly and if not provide some debugging output.
 
 SeleniumPrep.path_set?
 
-NOTE: Will return a boolean result in addition to helpful messaging. This will automatically run after downloading completes.
+NOTE: Will return a boolean result in addition to debugging output.
 
 == LICENSE:
 

data/lib/selenium-prep.rb

@@ -2,31 +2,39 @@ require_relative 'selenium-prep/downloader'
 require_relative 'selenium-prep/system/path'
 require_relative 'selenium-prep/system/folder'
 require_relative 'selenium-prep/system/extract'
-require_relative 'selenium-prep/overrides'
+require_relative 'selenium-prep/system/os'
 
 module SeleniumPrep
 
+  def self.prep
+    System::OS.set_type
+    download
+    System::Path.set
+    path_set?
+  end
+
   def self.download
+    System::OS.set_type
     ConfigChecker.new
     System::Folder.create_directory
     System::Folder.prompt_user if System::Folder.downloads_exist?
     Downloader.download
     System::Extract.extract_zip_files
     System::Extract.delete_zip_files
-    puts "\n"
-    path_set?
   end
 
   def self.path_set?
+    System::OS.set_type
     ConfigChecker.new
     result = System::Path.set?
     result ?
       (puts "Selenium is ready to use!") :
       (puts "Your PATH is not configured correctly. \n\nHere is what it's set to now:\n")
     puts System::Path.path
-    puts "\n"
-    System::Path.set
     result
   end
 
+  private
+
+
 end

data/lib/selenium-prep/system/os.rb

@@ -0,0 +1,32 @@
+module SeleniumPrep
+  module System
+    module OS
+
+      extend self
+
+      def windows?
+        (/cygwin|mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM) != nil
+      end
+
+      def mac?
+       (/darwin/ =~ RUBY_PLATFORM) != nil
+      end
+
+      def unix?
+        !windows?
+      end
+
+      def linux?
+        unix? and not mac?
+      end
+
+      def set_type
+        ENV['SE_OS_TYPE'] = 'win'   if System::OS.windows?
+        ENV['SE_OS_TYPE'] = 'mac'   if System::OS.mac?
+        ENV['SE_OS_TYPE'] = 'linux' if System::OS.linux?
+        ENV['SE_OS_TYPE'] = ENV['SE_OS_TYPE'] + (ENV['SE_OS_TYPE_BIT'] ||= '32')
+      end
+
+    end
+  end
+end

data/lib/selenium-prep/system/path.rb

@@ -6,35 +6,42 @@ module SeleniumPrep
 
       def self.set
         ConfigChecker.new
-        puts "You need to add #{ENV['SE_DOWNLOAD_LOCATION']} to your path.\n\n"
         case ENV['SE_OS_TYPE']
         when 'win32', 'win64'
-          puts "For instructions on how to do that read:\n http://www.computerhope.com/issues/ch000549.htm"
+          system("set path=%path%;#{ENV['SE_DOWNLOAD_LOCATION']}")
+          system('reg.exe ADD "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Environment" /v Path /t REG_EXPAND_SZ /d %path% /f')
+          ENV['PATH'] = "#{ENV['PATH']};#{ENV['SE_DOWNLOAD_LOCATION']}"
         when 'mac32', 'linux32', 'linux64'
-          puts "For instructions on how to do that read:\n http://unix.stackexchange.com/questions/26047/how-to-correctly-add-a-path-to-path"
+          unless set?
+            unless bash_updated?
+              system("echo 'export PATH=$PATH:#{ENV['SE_DOWNLOAD_LOCATION']}' | sudo tee -a ~/.bash_profile")
+            end
+            system('source ~/.bash_profile')
+            ENV['PATH'] = "#{ENV['PATH']}:/#{ENV['SE_DOWNLOAD_LOCATION']}"
+          end
         end
       end
 
       def self.set?
-        ConfigChecker.new
         case ENV['SE_OS_TYPE']
         when 'win32', 'win64'
-          `echo %PATH%'`.include? ENV['SE_DOWNLOAD_LOCATION']
+          path.include?(ENV['SE_DOWNLOAD_LOCATION'])
         when 'mac32', 'linux32', 'linux64'
-          `echo $PATH`.include? ENV['SE_DOWNLOAD_LOCATION']
+          path.include?(ENV['SE_DOWNLOAD_LOCATION']) && bash_updated?
         end
       end
 
       def self.path
         ConfigChecker.new
-        case ENV['SE_OS_TYPE']
-        when 'win32', 'win64'
-          `echo %PATH%'`
-        when 'mac32', 'linux32', 'linux64'
-          `echo $PATH`
-        end
+        ENV['PATH']
       end
 
+      private
+
+        def self.bash_updated?
+          !`cat ~/.bash_profile | grep #{ENV['SE_DOWNLOAD_LOCATION']}`.empty?
+        end
+
     end
   end
 end

data/lib/selenium-prep/version.rb

@@ -1,3 +1,3 @@
 module SeleniumPrep
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
 end

data/spec/config-checker_spec.rb

@@ -1,22 +1,9 @@
-require_relative 'spec_helper'
 require_relative '../lib/selenium-prep'
 
 describe 'Config Checker -> ' do
 
-  before(:each) do
-    ENV['SE_OS_TYPE'] = nil
-    ENV['SE_DOWNLOAD_LOCATION'] = nil
-  end
-
-  it 'no OS type' do
-    ENV['SE_DOWNLOAD_LOCATION'] = 'asdf'
-    expect { SeleniumPrep.download }.to raise_error(
-      RuntimeError,
-      'You need to specify an operating system type with SE_OS_TYPE.')
-  end
-
   it 'no Download Location' do
-    ENV['SE_OS_TYPE'] = 'asdf'
+    ENV['SE_DOWNLOAD_LOCATION'] = nil
     expect { SeleniumPrep.download }.to raise_error(
       RuntimeError,
       'You need to specify a download location with SE_DOWNLOAD_LOCATION.')

data/spec/downloader_spec.rb

@@ -1,10 +1,10 @@
-require_relative 'spec_helper'
+require_relative '../lib/selenium-prep/system/os'
 require_relative '../lib/selenium-prep/downloader'
 
 describe 'Downloader' do
 
   before(:all) do
-    ENV['SE_OS_TYPE'] = 'mac32'
+    SeleniumPrep::System::OS.set_type
     @loc = ENV['SE_DOWNLOAD_LOCATION'] = File.join(Dir.pwd, 'spec/tmp/downloader')
     FileUtils.rm_rf @loc
     FileUtils.mkdir_p(@loc)

data/spec/extract_spec.rb

@@ -1,11 +1,11 @@
-require_relative 'spec_helper'
+require_relative '../lib/selenium-prep/system/os'
 require_relative '../lib/selenium-prep/downloader'
 require_relative '../lib/selenium-prep/system/extract'
 
 describe 'Extract', :acceptance do
 
   before(:all) do
-    ENV['SE_OS_TYPE'] = 'mac32'
+    SeleniumPrep::System::OS.set_type
     @loc = ENV['SE_DOWNLOAD_LOCATION'] = File.join(Dir.pwd, 'spec/tmp/file')
     FileUtils.rm_rf @loc
     FileUtils.mkdir_p @loc
@@ -23,7 +23,7 @@ describe 'Extract', :acceptance do
   it 'extracts' do
     file_count = files.count
     SeleniumPrep::System::Extract.extract_zip_files
-    expect(files.count).to eql file_count + 1
+    expect(files.count).to be > file_count
   end
 
   it 'cleans up' do

data/spec/folder_spec.rb

@@ -1,4 +1,3 @@
-require_relative 'spec_helper'
 require_relative '../lib/selenium-prep/system/folder'
 
 describe 'Folder creation -> ' do

data/spec/path_spec.rb

@@ -0,0 +1,13 @@
+require_relative '../lib/selenium-prep/system/os'
+require_relative '../lib/selenium-prep/system/path'
+
+describe 'Path' do
+
+  it 'sets' do
+    SeleniumPrep::System::OS.set_type
+    ENV['SE_DOWNLOAD_LOCATION'] = File.join(Dir.pwd, 'spec/tmp/selenium-prep')
+    SeleniumPrep::System::Path.set
+    expect(SeleniumPrep::System::Path.set?).to be true
+  end
+
+end

data/spec/selenium-prep_spec.rb

@@ -1,11 +1,10 @@
-require_relative 'spec_helper'
+require_relative '../lib/selenium-prep/system/os'
 require_relative '../lib/selenium-prep'
 
 describe 'Selenium Prep', :acceptance do
 
   it 'downloads' do
-    ENV['SE_DEBUG'] = 'off'
-    ENV['SE_OS_TYPE'] = 'mac32'
+    SeleniumPrep::System::OS.set_type
     loc = ENV['SE_DOWNLOAD_LOCATION'] = File.join(Dir.pwd, 'spec/tmp/selenium-prep')
     FileUtils.rm_rf loc
     SeleniumPrep::System::Folder.create_directory

data/spec/url_spec.rb

@@ -1,4 +1,3 @@
-require_relative 'spec_helper'
 require_relative '../lib/selenium-prep/urls'
 require 'typhoeus'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: selenium-prep
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Dave Haeffner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-27 00:00:00.000000000 Z
+date: 2014-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus
@@ -113,9 +113,9 @@ files:
 - lib/selenium-prep.rb
 - lib/selenium-prep/config-checker.rb
 - lib/selenium-prep/downloader.rb
-- lib/selenium-prep/overrides.rb
 - lib/selenium-prep/system/extract.rb
 - lib/selenium-prep/system/folder.rb
+- lib/selenium-prep/system/os.rb
 - lib/selenium-prep/system/path.rb
 - lib/selenium-prep/urls.rb
 - lib/selenium-prep/version.rb
@@ -124,8 +124,8 @@ files:
 - spec/downloader_spec.rb
 - spec/extract_spec.rb
 - spec/folder_spec.rb
+- spec/path_spec.rb
 - spec/selenium-prep_spec.rb
-- spec/spec_helper.rb
 - spec/url_spec.rb
 homepage: https://github.com/tourdedave/selenium-prep
 licenses:
@@ -156,6 +156,6 @@ test_files:
 - spec/downloader_spec.rb
 - spec/extract_spec.rb
 - spec/folder_spec.rb
+- spec/path_spec.rb
 - spec/selenium-prep_spec.rb
-- spec/spec_helper.rb
 - spec/url_spec.rb

data/lib/selenium-prep/overrides.rb

@@ -1,19 +0,0 @@
-module SeleniumPrep
-
-  def self.debug_off?
-    ENV['SE_DEBUG'] == 'off'
-  end
-
-end
-
-module Kernel
-
-  def puts(input)
-    super input unless SeleniumPrep.debug_off?
-  end
-
-  def print(input)
-    super input unless SeleniumPrep.debug_off?
-  end
-
-end

data/spec/spec_helper.rb

@@ -1,2 +0,0 @@
-require_relative '../lib/selenium-prep/overrides'
-ENV['SE_DEBUG'] = 'off'