zander 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6aaa7c38e9278f9c8474b0c371ea89110d9a98b1
-  data.tar.gz: 1fe1d38ba97b125b85d8cbe7c77acff4c03a954f
+  metadata.gz: fabb7581a9303c85870e21c1fa522444dfaea9c7
+  data.tar.gz: 0e190d9be3641b67d95401f354b2df8b4278ca44
 SHA512:
-  metadata.gz: 5aaa95cc9d3ec254634c89caba8907afa4d4f1d2b5b848e08ca732f5cdea55aed7e50983635079cb1a9dede55f27a3b0bb51da30170b1dcf065f28b501ede945
-  data.tar.gz: 09b171f1e978786c8581a613b8ca935bbe48322749a00406cc23d496c6a5cfa329dcb7e9d34d9455f457705958d72b7792b2edd40957e8b216de11853dd7eb0b
+  metadata.gz: 8b21e3a697ba024082fd9ff0b71fa416657d235b50fc5623ac208b4455ae49af7b9715f89b199de76456014dd56447b7d2369367821038a2e433bb5fb2ebb022
+  data.tar.gz: 9b40ab0106c860fbb7a8cda7054e1a4ff3306afcd518976d15ca9c45c3d8f31d1b482df36bfa1009b8a2bbf77e62897c0bd1c04d8aabe8644106b4d82c959d56

data/Gemfile

@@ -1,6 +1,5 @@
 source 'https://rubygems.org'
 gem 'selenium-webdriver', '~> 2.43.0'
 gem 'json', '~> 1.8.1'
-#gem 'prawn', '~> 1.3.0'
 gem 'pdfkit', '~> 0.6.2'
 gem 'yard', '~> 0.8.7.6'

data/README.md

@@ -28,18 +28,20 @@ Usage
 	cut -d '(' -f 2 | sed 's/)//g')/bin/zander"
 
 #### Custom Input Example
-`require 'zander'
-Zander.run(sites: "sites.yaml", actions: "actions.yaml")`
+    require 'zander'
+    Zander.run(sites: "sites.yaml", actions: "actions.yaml")
 
 sites.yaml
-	WEBSITES:
-	  - url: https://www.google.com/
-	    user_name: "Replace this with your username"
-	    password: "Replace this with your password"
+
+    WEBSITES:
+      - url: https://www.google.com/
+        user_name: "Replace this with your username"
+        password: "Replace this with your password"
 
 
 actions.yaml
-	WEBSITES:
+	
+    WEBSITES:
 	  - URL: https://www.google.com/
 	    ACTIONS:
 	      - action:
@@ -67,7 +69,13 @@ actions.yaml
 	      - manual:
 	      - action:
 	        action_type: done
-	        
+
+Notice: variable names and their values are defined by you in `sites.yaml`. 
+variables can then be used in `actions.yaml`. i.e. You could change `user_name:` 
+to `email:` or any other value that you prefer and as long as you also 
+update `user_name` to 'email' in the `actions.yaml` it will still work.
+
 Documentation
 ---
-source documentation [http://bit.ly/zanderdoc](http://bit.ly/zanderdoc)
+* `actions.yaml` documentation [docs](http://)
+* source documentation [http://bit.ly/zanderdoc](http://bit.ly/zanderdoc)

data/bin/zander

@@ -27,7 +27,7 @@
 # a full example is shown at the bottom 															  #
 #  										  															  #
 #######################################################################################################
-require 'zander'
+require 'zander'																					  #
 #######################################################################################################
 ###	 		1.) Demo  -  Uses share/sites.yaml and shre/actions.yaml								###
 Zander.run																							###

data/lib/zander.rb

@@ -21,26 +21,35 @@ lib = File.expand_path('../../lib/', __FILE__)
 $:.unshift lib unless $:.include?(lib)
 # p $:.dup
 
+require 'logger'
+
 module Zander
+	@@log_level = nil
+	LOG_FILE = STDOUT # 'log.txt'
+	LOG = ::Logger.new(LOG_FILE,10,1024000)
+
 	def self.run(sites: nil, actions: nil, steps: nil)
-		
+		LOG.level = Logger::INFO
+		LOG.level = @@log_level unless @@log_level == nil
+
 		if steps == nil
 			steps = ARGV[0].split(',').map(&:to_i) unless ARGV[0] == nil
 		end
 		
 		if (sites != nil && actions != nil)
-			zander = Sites.new(sites,steps)
+			zander = Sites.new(sites,steps, LOG)
 			zander.add_actions(actions)
 		else
-			zander = Sites.new(Util.get_path('share/sites.yaml'),steps)
+			zander = Sites.new(Util.get_path('share/sites.yaml'),steps, LOG)
 			zander.add_actions(Util.get_path('share/actions.yaml'))
 		end
-		
-		zander.set_log_level Logger::DEBUG
 		zander.sites.each do |site|
 			site.drive
 		end
+	end
 
+	def self.log_level(level)
+		@@log_level = level
 	end
 end
 require 'zander/cmd_mapper'
@@ -53,7 +62,7 @@ require 'zander/ht'
 
 require 'selenium-webdriver'
 require 'yaml'
-require 'logger'
+
 
 
 

data/lib/zander/site.rb

@@ -19,7 +19,6 @@ module Zander
 	  	def add_actions(actions)
 			actions.each do |action|
 				# convert keys in action hash to symbols
-				puts "Action Hash::: #{action}"
 				action = action.keys_to_sym
 				@log.debug("Create action #{action}")
 				obj = CommandMapper.map(self, @driver, @log, action)
@@ -67,8 +66,10 @@ module Zander
 					@actions.each do |action|
 						vars << action.to_s
 					end
+				elsif key.to_s == "@password"
+					vars << "#{key}=\"#{mask(value)}\""
 				elsif index == vh.size - 1 
-					vars << "#{key}=\"#{value}\"" 
+					vars << "#{key}=\"#{value}\""
 				else 
 					"#{key}=\"#{value}\", " 
 				end
@@ -76,6 +77,15 @@ module Zander
 			vars
 		end
 
+		def mask(var)
+			clear = 3 #keep last 3 in clear text
+			masked = var[0]; 
+			(var.length-(clear+1)).times do
+				masked << '*'
+			end
+			masked << var[(var.length-clear)...var.length]
+		end
+
 		def inspect
 			to_s
 		end

data/lib/zander/sites.rb

@@ -3,14 +3,12 @@ module Zander
 		IMPLICIT_WAIT = 10
 		YAML_URL = 'URL'
 		YAML_ACTIONS = 'ACTIONS'
-		LOG_FILE = STDOUT # 'log.txt'
 
 		attr_reader :sites
 
-		def initialize(yaml_file, steps = nil)
+		def initialize(yaml_file, steps = nil, log)
 			@sites_yaml_file = yaml_file
-			@log = Logger.new(LOG_FILE,10,1024000)
-			@log.level = Logger::DEBUG
+			@log = log
 			@sites = Array.new
 			### FIREFOX PROFILE
 			profile = Selenium::WebDriver::Firefox::Profile.new
@@ -36,11 +34,11 @@ module Zander
 			if yaml.has_key? 'WEBSITES'
 				yaml['WEBSITES'].each_with_index do |site, index|
 					if steps == nil
-						@log.debug("Create Site #{site}")
+						@log.debug("Create site object for #{site['url']}")
 						@sites.push(Site.new(parent: self, hash: site, driver: @driver, log: @log))
 					else
 						if steps.include?(index)
-							@log.debug("Create Site #{site}")
+							@log.debug("Create site object for #{site['url']}")
 							@sites.push(Site.new(parent: self, hash: site, driver: @driver, log: @log))
 						end
 					end
@@ -49,10 +47,6 @@ module Zander
 			end
 		end
 
-		def set_log_level(level)
-			@log.level = level
-		end
-
 		def get_site(url)
 			@sites.each do |site|
 				return site if site.url == url

data/lib/zander/version.rb

@@ -1,5 +1,6 @@
 module Zander
 	#VERSION = '0.1.0' # initial release
 	#VERSION = '0.1.1' # fiexed binary and added documentation
-	VERSION = '0.1.2' # updated gemspec
+	#VERSION = '0.1.2' # updated gemspec
+	VERSION = '0.1.3' # fixed logging
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zander
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Spencer Carlson