gridium 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0760717c783e365d6af7f505001cc465de38fb54
-  data.tar.gz: 4f49bca1f7cfba116f17912dd9e59e79156a7f09
+  metadata.gz: 6dc29df3a04ae8f95ff1c46bcfa7a89c674d8093
+  data.tar.gz: 9f6ebb099df861db7955dff000b64d4e150ee975
 SHA512:
-  metadata.gz: 72f5b466294567a7028d0623c395f6fccfcfb70c5346910d39e1a7a782733d71ba84e73a0733176050420b5bdeb3aa887dd076afdefe3be36a0a25b5aee98c8c
-  data.tar.gz: 71712e430341993dab8522938572af4b804f21a8d04c08b9b63f83d68feefba9e22d11faf87e9a790eb46c77574a2919fd6684b07c21680de76d56cabb072a9a
+  metadata.gz: a7d619fc44d6ad485bd3f3eba756004128e7cc294ed96432e14099d72a6751758f5a468326c76a7a13fabddba2be8f71237a5488b8071d9558ec07b8d8f7325b
+  data.tar.gz: 58b0c9a013a9e2edfc59a6e3f8323acfc8da377c01edad71853d33f2784d97e90c69eb70aa07e64c54d2988c2d00afb57ce96619172c8d11dd7e0f82d6279b86

data/.gitignore

@@ -22,9 +22,10 @@ Dockerfile-e
 /test/tmp/
 /test/version_tmp/
 /tmp/
+/test_results
 
 # Used by dotenv library to load environment variables.
-# .env
+.env
 
 ## Specific to RubyMotion:
 .dat*

data/.jenkins-docker

@@ -0,0 +1,49 @@
+#!/usr/bin/env sh
+set -eux
+#set -o pipefail
+
+_init_env() {
+  # leading colon force successful return code
+  : ${PUBLISH:=0} # If unset, default to 0
+  : ${REGISTRY:=docker.sendgrid.net}
+  : ${NAMESPACE:=${USER}}
+  : ${APPNAME=gridium}
+  : ${COMPOSE_PROJECT_NAME:=$APPNAME}
+
+  # If we're "jenkins" and on the "origin/master" branch, push to 'docker.sendgrid.net/sendgrid'
+  [[ "${USER}" == "jenkins" ]] && [[ "${GIT_BRANCH}" == "origin/master" ]] && NAMESPACE=sendgrid
+
+  export PUBLISH
+  export REGISTRY
+  export NAMESPACE
+  export APPNAME
+  export COMPOSE_PROJECT_NAME
+
+}
+
+run_test(){
+  docker exec $(docker-compose ps -q gridium) rake spec
+}
+
+main() {
+  echo "**** Arguments: $@"
+
+  # Cleanup regardless
+  trap bin/cleanup EXIT
+
+  _init_env
+
+  if [[ "${SKIPDOCKERPULL:=0}" -eq 1 ]]; then
+    echo "Skipping docker pull"
+  else
+    bin/pull
+  fi
+
+  bin/start -i
+  sleep 2
+
+  run_test
+}
+
+
+main

data/Dockerfile

@@ -1,8 +1,8 @@
 FROM ruby:2.3
 
-WORKDIR /
+WORKDIR /gridium
 
-COPY . /
+COPY . /gridium
 
 CMD gem install bundle;
 RUN bundle;

data/Gemfile

@@ -6,3 +6,4 @@ gemspec
 gem 'rspec-mocks'
 gem 'rspec'
 gem 'rake'
+gem 'dotenv'

data/Rakefile

@@ -2,7 +2,7 @@ require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec) do |t|
-  t.pattern = 'spec/testrail_spec.rb'
+  t.pattern = 'spec/*_spec.rb'
 end
 
 task :default => :spec

data/bin/cleanup

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+main() {
+  docker-compose kill
+
+  docker-compose rm -fv
+
+  docker rmi $(docker images -f "dangling=true" -q)
+
+  docker run -v /var/run/docker.sock:/var/run/docker.sock -v /var/lib/docker:/var/lib/docker --rm martin/docker-cleanup-volumes
+
+}
+
+main

data/bin/pull

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+main() {
+  docker-compose pull
+}
+
+main

data/bin/start

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+main(){
+  case $1 in
+    -i) #start normally
+      docker-compose up -d
+      ;;
+    -d) #start in development mode
+      docker-compose -f docker-compose.yml -f docker-compose.dev.yml up -d
+      ;;
+    *)
+      echo "Usage: $0 [-i] isolated [-d] gridium dev" 1>&2; exit 1;
+      ;;
+  esac
+}
+
+main $1

data/docker-compose.dev.yml

@@ -0,0 +1,5 @@
+version: '2'
+services:
+  gridium:
+    volumes:
+      - $GRIDIUMPATH:/gridium

data/lib/element.rb

@@ -366,7 +366,7 @@ class Element
 
   def field_empty_afterward?(*args)
     Log.debug("Checking the field after sending #{args}, to see if it's empty")
-    check_again = (not args.empty? and no_symbols? *args)
+    check_again = (has_characters? *args and no_symbols? *args)
     field_is_empty_but_should_not_be = (check_again and field_empty?)
     if field_is_empty_but_should_not_be
       raise "Browser Error: tried to input #{args} but found an empty string afterward: #{value}"
@@ -403,4 +403,17 @@ class Element
     false
   end
 
+  #
+  # helper to check if *args is not empty but contains only empty string(s)/symbol(s)
+  # if so, don't bother trying to validate the text afterward
+  #
+
+  def has_characters?(*args)
+    characters = args.select { |_| not _.is_a? Symbol }.join('')
+    if characters.empty?
+      return false
+    end
+    true
+  end
+
 end

data/lib/gridium/version.rb

@@ -1,3 +1,3 @@
 module Gridium
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/lib/s3.rb

@@ -1,14 +1,13 @@
 require 'aws-sdk'
 module Gridium
 
-
     class GridiumS3
 
         DELIMITER = "/"
 
         def initialize(project_name, subdirectory_name='screenshots')
             Log.debug("initializing GridiumS3 with #{project_name} and #{subdirectory_name}")
-            Aws.config.update({ credentials: Aws::Credentials.new(ENV['S3_ACCESS_KEY_ID'], ENV['S3_SECRET_ACCESS_KEY']) ,region: ENV['S3_DEFAULT_REGION']})
+            Aws.config.update({ credentials: Aws::Credentials.new(ENV['S3_ACCESS_KEY_ID'], ENV['S3_SECRET_ACCESS_KEY']) , region: ENV['S3_DEFAULT_REGION']})
             _validate_string(project_name)
             _validate_string(subdirectory_name)
             @project_name = _sanitize_string(project_name)
@@ -37,12 +36,12 @@ module Gridium
 
         def _sanitize_string(input_string)
             #remove left/right whitespace, split and join to collapse contiguous white space, replace whitespace and non-period special chars with underscore
-            input_string = input_string.strip().split.join(" ").gsub(/[^\w.]/i, '_') 
+            input_string = input_string.strip().split.join(" ").gsub(/[^\w.]/i, '_')
             input_string
         end
 
         def _validate_string(input_string)
-            Log.debug("attempting to validate #{input_string} for use as a name") 
+            Log.debug("attempting to validate #{input_string} for use as a name")
             if input_string.empty? or input_string.strip().empty? then
                 raise(ArgumentError, "empty and/or whitespace file names are not wanted here.")
             end
@@ -59,7 +58,7 @@ module Gridium
             upload_size = @bucket.object(s3_name).content_length
             local_size = File.size local_absolute_path
             Log.debug("file upload verified: #{upload_size == local_size}. upload size is #{upload_size} and local size is #{local_size}")
-            upload_size == local_size            
+            upload_size == local_size
         end
     end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gridium
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Seth Urban
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-22 00:00:00.000000000 Z
+date: 2017-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -139,6 +139,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".jenkins-docker"
 - ".rspec"
 - CODE_OF_CONDUCT.md
 - Dockerfile
@@ -146,10 +147,10 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- bin/console
-- bin/docker/cleanup.sh
-- bin/docker/start.sh
-- bin/setup
+- bin/cleanup
+- bin/pull
+- bin/start
+- docker-compose.dev.yml
 - docker-compose.yml
 - gridium.gemspec
 - lib/driver.rb
@@ -185,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: This Gem is used to make building Selenium Tests without Capybara Easier.

data/bin/console

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "gridium"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start

data/bin/docker/cleanup.sh

@@ -1,8 +0,0 @@
-#!/bin/bash
-
-#do normal docker cleanup
-docker rm -fv $(docker ps -qa)
-
-#purge any gridium images so docker-compose up will rebuild it
-docker rmi $(docker images gridium_gridium --format "{{.ID}}")
-

data/bin/docker/start.sh

@@ -1,6 +0,0 @@
-#!/bin/bash
-
-docker-compose up
-
-#now shell into gridium container and execute tests you want to see run
-# docker exec gridium_gridium_1 rspec /spec/element_spec.rb -e "text input"

data/bin/setup

@@ -1,7 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-IFS=$'\n\t'
-
-bundle install
-
-# Do any other automated setup that you need to do here