selenium_shots 0.2.1 → 0.2.2

data/lib/selenium_shots/cli/command.rb

@@ -1,52 +1,52 @@
 module SeleniumShots
-	module Command
-		class InvalidCommand < RuntimeError; end
-		class CommandFailed  < RuntimeError; end
+  module Command
+    class InvalidCommand < RuntimeError; end
+    class CommandFailed  < RuntimeError; end
 
-		class << self
-			def run(command, args)
-				run_internal(command, args)
-			rescue InvalidCommand
-				display "Unknown command. Run 'selenium_shots help' for usage information."
-    	rescue RestClient::Unauthorized
-				display "Authentication failure. For more information you can go to http://www.seleniumshots.com"
-			end
+    class << self
+      def run(command, args)
+        run_internal(command, args)
+      rescue InvalidCommand
+        display "Unknown command. Run 'selenium_shots help' for usage information."
+      rescue RestClient::Unauthorized
+        display "Authentication failure. For more information you can go to http://www.seleniumshots.com"
+      end
 
-			def run_internal(command, args)
-				namespace, command = parse(command)
-				require "#{namespace}"
-				klass = SeleniumShots::Command.const_get(namespace.capitalize).new(args)
-				raise InvalidCommand unless klass.respond_to?(command)
-				klass.send(command)
-			end
+      def run_internal(command, args)
+        namespace, command = parse(command)
+        require "#{namespace}"
+        klass = SeleniumShots::Command.const_get(namespace.capitalize).new(args)
+        raise InvalidCommand unless klass.respond_to?(command)
+        klass.send(command)
+      end
 
-			def display(msg)
-				puts(msg)
-			end
+      def display(msg)
+        puts(msg)
+      end
 
-			def parse(command)
-				parts = command.split(':')
-				case parts.size
-					when 1
-						if namespaces.include? command
-							return command, 'index'
-						else
-							return 'app', command
-						end
-					when 2
-						raise InvalidCommand unless namespaces.include? parts[0]
-						return parts
-					else
-						raise InvalidCommand
-				end
-			end
+      def parse(command)
+        parts = command.split(':')
+        case parts.size
+          when 1
+            if namespaces.include? command
+              return command, 'index'
+            else
+              return 'app', command
+            end
+          when 2
+            raise InvalidCommand unless namespaces.include? parts[0]
+            return parts
+          else
+            raise InvalidCommand
+        end
+      end
 
-			def namespaces
-				@@namespaces ||= Dir["#{File.dirname(__FILE__)}/commands/*"].map do |namespace|
-					namespace.gsub(/.*\//, '').gsub(/\.rb/, '')
-				end
-			end
-		end
-	end
+      def namespaces
+        @@namespaces ||= Dir["#{File.dirname(__FILE__)}/commands/*"].map do |namespace|
+          namespace.gsub(/.*\//, '').gsub(/\.rb/, '')
+        end
+      end
+    end
+  end
 end
 

data/lib/selenium_shots/cli/commands/app.rb

@@ -1,16 +1,16 @@
 module SeleniumShots::Command
-	class App < Base
+  class App < Base
     def create
-		  name = args.shift.downcase.strip rescue nil
+      name = args.shift.downcase.strip rescue nil
       if name
         selenium_shots_api_key
         if make_config_file(name, @api_key) == "y"
-		      display "Created #{name}\nYou can configurate selenium shots on config/selenium_shots.yml"
+          display "Created #{name}\nYou can configurate selenium shots on config/selenium_shots.yml"
         end
       else
         display "You need specify a name for your app. Run 'selenium_shots help' for usage information"
       end
     end
-	end
+  end
 end
 

data/lib/selenium_shots/cli/commands/auth.rb

@@ -1,127 +1,127 @@
 module SeleniumShots::Command
-	class Auth < Base
-		attr_accessor :api_key_hash
+  class Auth < Base
+    attr_accessor :api_key_hash
 
-		def client
-			@client ||= init_selenium_shots
-		end
+    def client
+      @client ||= init_selenium_shots
+    end
 
-		def init_selenium_shots
-			SeleniumShots::Client.new(api_key)
-		end
+    def init_selenium_shots
+      SeleniumShots::Client.new(api_key)
+    end
 
-		def api_key
+    def api_key
       get_api_key
-		end
+    end
 
     def get_api_key_from_host
       RestClient.post 'http://seleniumshots.com/selenium_tests/get_api_key', :user_session => { :email => @api_key_hash[0],
                                                                              :password => @api_key_hash[1]}
     end
 
-		def api_key_file
-			"#{home_directory}/.selenium_shots/api_key"
-		end
-
-		def get_api_key
-			return if @api_key_hash
-			unless @api_key_hash = read_api_key
-				@api_key_hash = ask_for_api_key
-				save_api_key
-			end
-			@api_key_hash
-		end
-
-		def read_api_key
-			if File.exists? api_key_file
-				return File.read(api_key_file).split("\n")
-			end
-		end
-
-		def echo_off
-			system "stty -echo"
-		end
-
-		def echo_on
-			system "stty echo"
-		end
-
-		def ask_for_api_key
-			puts "Enter your SeleniumShots Account"
-
-			print "Email: "
-			user = ask
-
-			print "Password: "
-			password = running_on_windows? ? ask_for_password_on_windows : ask_for_password
-
-			[ user, password ]
-		end
-
-		def ask_for_password_on_windows
-			require "Win32API"
-			char = nil
-			password = ''
-
-			while char = Win32API.new("crtdll", "_getch", [ ], "L").Call do
-				break if char == 10 || char == 13 # received carriage return or newline
-				if char == 127 || char == 8 # backspace and delete
-					password.slice!(-1, 1)
-				else
-					password << char.chr
-				end
-			end
-			puts
-			return password
-		end
-
-		def ask_for_password
-			echo_off
-			password = ask
-			puts
-			echo_on
-			return password
-		end
-
-		def save_api_key
-			begin
+    def api_key_file
+      "#{home_directory}/.selenium_shots/api_key"
+    end
+
+    def get_api_key
+      return if @api_key_hash
+      unless @api_key_hash = read_api_key
+        @api_key_hash = ask_for_api_key
+        save_api_key
+      end
+      @api_key_hash
+    end
+
+    def read_api_key
+      if File.exists? api_key_file
+        return File.read(api_key_file).split("\n")
+      end
+    end
+
+    def echo_off
+      system "stty -echo"
+    end
+
+    def echo_on
+      system "stty echo"
+    end
+
+    def ask_for_api_key
+      puts "Enter your SeleniumShots Account"
+
+      print "Email: "
+      user = ask
+
+      print "Password: "
+      password = running_on_windows? ? ask_for_password_on_windows : ask_for_password
+
+      [ user, password ]
+    end
+
+    def ask_for_password_on_windows
+      require "Win32API"
+      char = nil
+      password = ''
+
+      while char = Win32API.new("crtdll", "_getch", [ ], "L").Call do
+        break if char == 10 || char == 13 # received carriage return or newline
+        if char == 127 || char == 8 # backspace and delete
+          password.slice!(-1, 1)
+        else
+          password << char.chr
+        end
+      end
+      puts
+      return password
+    end
+
+    def ask_for_password
+      echo_off
+      password = ask
+      puts
+      echo_on
+      return password
+    end
+
+    def save_api_key
+      begin
         @api_key_hash = get_api_key_from_host
-				write_api_key
-			rescue RestClient::Unauthorized => e
-				delete_api_key
-				raise e unless retry_login?
-				display "\nAuthentication failed"
-				@api_key_hash = ask_for_api_key
-				@client = init_selenium_shots
-				retry
-			rescue Exception => e
-				delete_api_key
-				raise e
-			end
-		end
-
-		def retry_login?
-			@login_attempts ||= 0
-			@login_attempts += 1
-			@login_attempts < 3
-		end
-
-		def write_api_key
-			FileUtils.mkdir_p(File.dirname(api_key_file))
-			File.open(api_key_file, 'w') do |f|
-				f.puts self.api_key_hash
-			end
-			set_api_key_permissions
-		end
-
-		def set_api_key_permissions
-			FileUtils.chmod 0700, File.dirname(api_key_file)
-			FileUtils.chmod 0600, api_key_file
-		end
-
-		def delete_api_key
-			FileUtils.rm_f(api_key_file)
-		end
-	end
+        write_api_key
+      rescue RestClient::Unauthorized => e
+        delete_api_key
+        raise e unless retry_login?
+        display "\nAuthentication failed"
+        @api_key_hash = ask_for_api_key
+        @client = init_selenium_shots
+        retry
+      rescue Exception => e
+        delete_api_key
+        raise e
+      end
+    end
+
+    def retry_login?
+      @login_attempts ||= 0
+      @login_attempts += 1
+      @login_attempts < 3
+    end
+
+    def write_api_key
+      FileUtils.mkdir_p(File.dirname(api_key_file))
+      File.open(api_key_file, 'w') do |f|
+        f.puts self.api_key_hash
+      end
+      set_api_key_permissions
+    end
+
+    def set_api_key_permissions
+      FileUtils.chmod 0700, File.dirname(api_key_file)
+      FileUtils.chmod 0600, api_key_file
+    end
+
+    def delete_api_key
+      FileUtils.rm_f(api_key_file)
+    end
+  end
 end
 

data/lib/selenium_shots/cli/commands/base.rb

@@ -1,39 +1,39 @@
 require 'fileutils'
 
 module SeleniumShots::Command
-	class Base
-		attr_accessor :args
-		def initialize(args)
-			@args = args
-		end
+  class Base
+    attr_accessor :args
+    def initialize(args)
+      @args = args
+    end
 
-		def selenium_shots
-			@selenium_shots ||= SeleniumShots::Command.run_internal('auth:client', args)
-		end
+    def selenium_shots
+      @selenium_shots ||= SeleniumShots::Command.run_internal('auth:client', args)
+    end
 
     def selenium_shots_api_key
       @api_key ||= SeleniumShots::Command.run_internal('auth:api_key', args)
     end
 
-		def display(msg, newline=true)
-			newline ? puts(msg) : print(msg)
-		end
+    def display(msg, newline=true)
+      newline ? puts(msg) : print(msg)
+    end
 
-		def ask
-			gets.strip
-		end
+    def ask
+      gets.strip
+    end
 
-		def shell(cmd)
-			`#{cmd}`
-		end
+    def shell(cmd)
+      `#{cmd}`
+    end
 
-		def home_directory
-			running_on_windows? ? ENV['USERPROFILE'] : ENV['HOME']
-		end
+    def home_directory
+      running_on_windows? ? ENV['USERPROFILE'] : ENV['HOME']
+    end
 
-		def running_on_windows?
-			RUBY_PLATFORM =~ /mswin32/
-		end
+    def running_on_windows?
+      RUBY_PLATFORM =~ /mswin32/
+    end
 
     def config_file
       'config/selenium_shots.yml'
@@ -42,8 +42,8 @@ module SeleniumShots::Command
 
   def ask_for_config_file
     if File.exists?(config_file)
-			print "The file config/selenium_shots.yml exists, do you want overwrite this? (y/n): "
-			ask
+      print "The file config/selenium_shots.yml exists, do you want overwrite this? (y/n): "
+      ask
     else
       "y"
     end
@@ -62,14 +62,14 @@ browsers:
     - IE8 on XP
     - Firefox3.6 on XP
 EOFILE
-			File.open(config_file, 'w') do |f|
-				f.puts config_file_hash
-			end
+      File.open(config_file, 'w') do |f|
+        f.puts config_file_hash
+      end
     end
     overwrite_or_create_file
   end
 
-	end
+  end
 
 end
 

data/lib/selenium_shots/cli/commands/help.rb

@@ -1,11 +1,11 @@
 module SeleniumShots::Command
-	class Help < Base
-		def index
-			display usage
-		end
+  class Help < Base
+    def index
+      display usage
+    end
 
-		def usage
-			usage = <<EOTXT
+    def usage
+      usage = <<EOTXT
 === General Commands
 
  help                     # show this usage
@@ -18,7 +18,7 @@ module SeleniumShots::Command
  (...make edits...)
  selenium_shots create example_one
 EOTXT
-		end
-	end
+    end
+  end
 end
 

data/lib/selenium_shots/test_selenium_shots.rb

@@ -96,6 +96,7 @@ class SeleniumShots < ActionController::IntegrationTest
         run_browser(browser_spec, block)
         @error = nil
       rescue  => error
+        @browser.close_current_browser_session if @browser
         @error = error.message
         if @error.match(/Failed to start new browser session/) && SeleniumConfig.mode == "local"
           @tmp_browsers ||= local_browsers
@@ -107,8 +108,8 @@ class SeleniumShots < ActionController::IntegrationTest
           end
         end
       end
-      assert @error.nil?, "Expected zero failures or errors, but got #{@error}\n"
     end
+    assert @error.nil?, "Expected zero failures or errors, but got #{@error}\n"
   end
 
   def run_browser(browser_spec, block)

data/spec/commands/app_spec.rb

@@ -1,26 +1,26 @@
 require File.dirname(__FILE__) + '/../base'
 
 module SeleniumShots::Command
-	describe App do
-		before do
-			@cli  = prepare_command(App)
-			@auth = prepare_command(Auth)
-		end
+  describe App do
+    before do
+      @cli  = prepare_command(App)
+      @auth = prepare_command(Auth)
+    end
 
-		it "creates with a name" do
-			@cli.stub!(:args).and_return([ 'myapp' ])
+    it "creates with a name" do
+      @cli.stub!(:args).and_return([ 'myapp' ])
       @cli.stub!(:selenium_shots_api_key).and_return("api_key")
       @cli.should_receive(:make_config_file)
-			@cli.create
-		end
+      @cli.create
+    end
 
-		it "cant creates app without a name" do
-			@cli.stub!(:args).and_return([ nil ])
+    it "cant creates app without a name" do
+      @cli.stub!(:args).and_return([ nil ])
       @cli.stub!(:selenium_shots_api_key)
       @cli.should_not_receive(:make_config_file)
-			@cli.create
-		end
+      @cli.create
+    end
 
-	end
+  end
 end
 

data/spec/commands/auth_spec.rb

@@ -1,83 +1,83 @@
 require File.dirname(__FILE__) + '/../base'
 
 module SeleniumShots::Command
-	describe Auth do
-		before do
-			@cli = prepare_command(Auth)
-		end
+  describe Auth do
+    before do
+      @cli = prepare_command(Auth)
+    end
 
-		it "reads api key from the api keys file" do
-			sandbox = "/tmp/cli_spec_#{Process.pid}"
-			File.open(sandbox, "w") { |f| f.write "api_key" }
-			@cli.stub!(:api_key_file).and_return(sandbox)
-			@cli.read_api_key.should == %w(api_key)
-		end
+    it "reads api key from the api keys file" do
+      sandbox = "/tmp/cli_spec_#{Process.pid}"
+      File.open(sandbox, "w") { |f| f.write "api_key" }
+      @cli.stub!(:api_key_file).and_return(sandbox)
+      @cli.read_api_key.should == %w(api_key)
+    end
 
-		it "takes the apikey from the file" do
-			@cli.stub!(:read_api_key).and_return(%w(api_key))
-			@cli.api_key.should == %w(api_key)
-		end
+    it "takes the apikey from the file" do
+      @cli.stub!(:read_api_key).and_return(%w(api_key))
+      @cli.api_key.should == %w(api_key)
+    end
 
-		it "asks for api_key when the file doesn't exist" do
-			sandbox = "/tmp/cli_spec_#{Process.pid}"
-			FileUtils.rm_rf(sandbox)
-			@cli.stub!(:api_key_file).and_return(sandbox)
-			@cli.should_receive(:ask_for_api_key).and_return(['u', 'p'])
-			@cli.should_receive(:save_api_key)
-			@cli.get_api_key.should == [ 'u', 'p' ]
-		end
+    it "asks for api_key when the file doesn't exist" do
+      sandbox = "/tmp/cli_spec_#{Process.pid}"
+      FileUtils.rm_rf(sandbox)
+      @cli.stub!(:api_key_file).and_return(sandbox)
+      @cli.should_receive(:ask_for_api_key).and_return(['u', 'p'])
+      @cli.should_receive(:save_api_key)
+      @cli.get_api_key.should == [ 'u', 'p' ]
+    end
 
-		it "writes the api_key to a file" do
-			sandbox = "/tmp/cli_spec_#{Process.pid}"
-			FileUtils.rm_rf(sandbox)
-			@cli.stub!(:api_key_file).and_return(sandbox)
-			@cli.stub!(:api_key_hash).and_return(['api_key'])
-			@cli.should_receive(:set_api_key_permissions)
-			@cli.write_api_key
-			File.read(sandbox).should == "api_key\n"
-		end
+    it "writes the api_key to a file" do
+      sandbox = "/tmp/cli_spec_#{Process.pid}"
+      FileUtils.rm_rf(sandbox)
+      @cli.stub!(:api_key_file).and_return(sandbox)
+      @cli.stub!(:api_key_hash).and_return(['api_key'])
+      @cli.should_receive(:set_api_key_permissions)
+      @cli.write_api_key
+      File.read(sandbox).should == "api_key\n"
+    end
 
-		it "sets ~/.selenium_shots/api_key to be readable only by the user" do
-			sandbox = "/tmp/cli_spec_#{Process.pid}"
-			FileUtils.rm_rf(sandbox)
-			FileUtils.mkdir_p(sandbox)
-			fname = "#{sandbox}/file"
-			system "touch #{fname}"
-			@cli.stub!(:api_key_file).and_return(fname)
-			@cli.set_api_key_permissions
-			File.stat(sandbox).mode.should == 040700
-			File.stat(fname).mode.should == 0100600
-		end
+    it "sets ~/.selenium_shots/api_key to be readable only by the user" do
+      sandbox = "/tmp/cli_spec_#{Process.pid}"
+      FileUtils.rm_rf(sandbox)
+      FileUtils.mkdir_p(sandbox)
+      fname = "#{sandbox}/file"
+      system "touch #{fname}"
+      @cli.stub!(:api_key_file).and_return(fname)
+      @cli.set_api_key_permissions
+      File.stat(sandbox).mode.should == 040700
+      File.stat(fname).mode.should == 0100600
+    end
 
-		it "writes api_key when the account is ok" do
-			@cli.stub!(:api_key)
-			@cli.should_receive(:write_api_key)
-			@cli.should_receive(:get_api_key_from_host).and_return("api_key")
-			@cli.save_api_key
-		end
+    it "writes api_key when the account is ok" do
+      @cli.stub!(:api_key)
+      @cli.should_receive(:write_api_key)
+      @cli.should_receive(:get_api_key_from_host).and_return("api_key")
+      @cli.save_api_key
+    end
 
-		it "save_api_key deletes the api_key when the resquest api_key is unauthorized" do
-			@cli.stub!(:write_api_key)
-			@cli.stub!(:retry_login?).and_return(false)
-			@cli.should_receive(:get_api_key_from_host).and_raise(RestClient::Unauthorized)
-			@cli.should_receive(:delete_api_key)
-			lambda { @cli.save_api_key }.should raise_error(RestClient::Unauthorized)
-		end
+    it "save_api_key deletes the api_key when the resquest api_key is unauthorized" do
+      @cli.stub!(:write_api_key)
+      @cli.stub!(:retry_login?).and_return(false)
+      @cli.should_receive(:get_api_key_from_host).and_raise(RestClient::Unauthorized)
+      @cli.should_receive(:delete_api_key)
+      lambda { @cli.save_api_key }.should raise_error(RestClient::Unauthorized)
+    end
 
 
-		it "asks for login again when not authorized, for three times" do
-			@cli.stub!(:read_api_key)
-			@cli.stub!(:write_api_key)
-			@cli.stub!(:delete_api_key)
-			@cli.should_receive(:get_api_key_from_host).exactly(3).times.and_raise(RestClient::Unauthorized)
-			@cli.should_receive(:ask_for_api_key).exactly(4).times
-			lambda { @cli.save_api_key }.should raise_error(RestClient::Unauthorized)
-		end
+    it "asks for login again when not authorized, for three times" do
+      @cli.stub!(:read_api_key)
+      @cli.stub!(:write_api_key)
+      @cli.stub!(:delete_api_key)
+      @cli.should_receive(:get_api_key_from_host).exactly(3).times.and_raise(RestClient::Unauthorized)
+      @cli.should_receive(:ask_for_api_key).exactly(4).times
+      lambda { @cli.save_api_key }.should raise_error(RestClient::Unauthorized)
+    end
 
-		it "deletes the api_key file" do
-			FileUtils.should_receive(:rm_f).with(@cli.api_key_file)
-			@cli.delete_api_key
-		end
-	end
+    it "deletes the api_key file" do
+      FileUtils.should_receive(:rm_f).with(@cli.api_key_file)
+      @cli.delete_api_key
+    end
+  end
 end
 

data/spec/commands/base_spec.rb

@@ -1,29 +1,29 @@
 require File.dirname(__FILE__) + '/../base'
 
 module SeleniumShots::Command
-	describe Base do
-		before do
-			@args = [1, 2]
-			@base = Base.new(@args)
-			@base.stub!(:display)
-		end
+  describe Base do
+    before do
+      @args = [1, 2]
+      @base = Base.new(@args)
+      @base.stub!(:display)
+    end
 
-		it "initializes the selenium_shots client with the Auth command" do
-			SeleniumShots::Command.should_receive(:run_internal).with('auth:client', @args)
-			@base.selenium_shots
-		end
+    it "initializes the selenium_shots client with the Auth command" do
+      SeleniumShots::Command.should_receive(:run_internal).with('auth:client', @args)
+      @base.selenium_shots
+    end
 
     it "creates or overwrite the selenium_shots yml file" do
-			sandbox = "/tmp/cli_spec_selenium_shots"
-			@base.stub!(:config_file).and_return(sandbox)
+      sandbox = "/tmp/cli_spec_selenium_shots"
+      @base.stub!(:config_file).and_return(sandbox)
       @base.should_receive(:ask_for_config_file).and_return("y")
       @base.make_config_file("myapp", "api_key")
       File.exists?(sandbox) == true
     end
 
     it "not overwrite the selenium_shots yml file" do
-			sandbox = "/tmp/cli_spec_selenium_shots"
-			@base.stub!(:config_file).and_return(sandbox)
+      sandbox = "/tmp/cli_spec_selenium_shots"
+      @base.stub!(:config_file).and_return(sandbox)
       @base.should_receive(:ask_for_config_file).and_return("n")
       @base.make_config_file("myapp", "api_key")
       File.exists?(sandbox) == false
@@ -33,6 +33,6 @@ module SeleniumShots::Command
       @base.config_file.should == 'config/selenium_shots.yml'
     end
 
-	end
+  end
 end
 

data/spec/commands/server_spec.rb

@@ -1,22 +1,22 @@
 require File.dirname(__FILE__) + '/../base'
 
 module SeleniumShots::Command
-	describe Server do
-		before do
-			@cli = prepare_command(Server)
-		end
+  describe Server do
+    before do
+      @cli = prepare_command(Server)
+    end
 
-		it "run local instance of selenium server" do
-			@cli.start
+    it "run local instance of selenium server" do
+      @cli.start
       File.exists?("/tmp/selenium_shots.pid") == true
-		end
+    end
 
-		it "stop local instance of selenium server" do
-			@cli.stop
+    it "stop local instance of selenium server" do
+      @cli.stop
       File.exists?("/tmp/selenium_shots.pid") == false
-		end
+    end
 
 
-	end
+  end
 end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Kyle J. Ginavan
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-23 00:00:00 -05:00
+date: 2010-06-08 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency