pictate 0.1.3 → 0.2.0

data/Gemfile

@@ -6,13 +6,12 @@ source "http://rubygems.org"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "shoulda", ">= 0"
+  gem "shoulda", "~> 3.0.0"
   gem "rdoc", "~> 3.12"
   gem "bundler", "~> 1.1.0"
   gem "jeweler", "~> 1.8.3"
-  gem "simplecov", ">= 0"
 end
 
-gem "selenium-webdriver", "~> 2.20"
+gem "selenium-webdriver", "~> 2.21.2"
 gem "choice", "~> 0.1.6"
-gem "spinning_cursor", "~> 0.1.0.rc1"
+gem "spinning_cursor", "~> 0.1.2"

data/Gemfile.lock

@@ -1,7 +1,8 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    childprocess (0.3.1)
+    addressable (2.2.7)
+    childprocess (0.3.2)
       ffi (~> 1.0.6)
     choice (0.1.6)
     ffi (1.0.11)
@@ -12,14 +13,17 @@ GEM
       rake
       rdoc
     json (1.6.6)
-    multi_json (1.2.0)
+    libwebsocket (0.1.3)
+      addressable
+    multi_json (1.3.2)
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
-    rubyzip (0.9.6.1)
-    selenium-webdriver (2.20.0)
+    rubyzip (0.9.8)
+    selenium-webdriver (2.21.2)
       childprocess (>= 0.2.5)
       ffi (~> 1.0)
+      libwebsocket (~> 0.1.3)
       multi_json (~> 1.0)
       rubyzip
     shoulda (3.0.1)
@@ -27,11 +31,7 @@ GEM
       shoulda-matchers (~> 1.0.0)
     shoulda-context (1.0.0)
     shoulda-matchers (1.0.0)
-    simplecov (0.6.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.5.3)
-    simplecov-html (0.5.3)
-    spinning_cursor (0.1.0.rc1)
+    spinning_cursor (0.1.2)
 
 PLATFORMS
   ruby
@@ -41,7 +41,6 @@ DEPENDENCIES
   choice (~> 0.1.6)
   jeweler (~> 1.8.3)
   rdoc (~> 3.12)
-  selenium-webdriver (~> 2.20)
-  shoulda
-  simplecov
-  spinning_cursor (~> 0.1.0.rc1)
+  selenium-webdriver (~> 2.21.2)
+  shoulda (~> 3.0.0)
+  spinning_cursor (~> 0.1.2)

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.2.0

data/bin/pictate

@@ -29,6 +29,14 @@ def show_error str="There was an error with the parsing..."
   exit
 end
 
+#
+# Check if java exists (needed for selenium)
+#
+`which java`
+if not $?.success?
+  show_error "Java is not installed. Pictate uses Selenium and HTMLUnit java applications."
+end
+
 #
 # Check image extension
 #

data/lib/pictate.rb

@@ -33,17 +33,23 @@ module Pictate
       selenium_path = server_path
     else
       previous_wd = FileUtils.pwd
-      FileUtils.cd(File.join PICTATE_ROOT, 'ext')
+      begin
+        FileUtils.cd(File.join ENV['HOME'], '.selenium')
+      rescue
+        FileUtils.mkdir(File.join ENV['HOME'], '.selenium')
+        FileUtils.cd(File.join ENV['HOME'], '.selenium')
+      end
       selenium_latest = Selenium::Server.latest
       if not File.exists? "selenium-server-standalone-#{selenium_latest}.jar"
+        @download = true
         SpinningCursor.set_banner "Downloading latest version of selenium " +
           "server standalone"
       end
-      selenium_path = Selenium::Server.download(selenium_latest)
+      @selenium_path = Selenium::Server.download(selenium_latest)
     end
 
     SpinningCursor.set_banner "Starting selenium standalone server"
-    @server = Selenium::Server.new(selenium_path, :background => true)
+    @server = Selenium::Server.new(@selenium_path, :background => true)
     @server.start
     caps = Selenium::WebDriver::Remote::Capabilities.htmlunit(
       :javascript_enabled => true)
@@ -57,6 +63,14 @@ module Pictate
   def stop_server
     @driver.quit
     @server.stop
+    if @download
+      SpinningCursor.set_message <<-EOF
+#{SpinningCursor.set_message nil}
+
+Selenium was downloaded to #{@selenium_path}.
+You can remove it if you need, but note that pictate will download it again if you don't specify another path.
+EOF
+    end
   end
 
   #
@@ -82,6 +96,5 @@ module Pictate
       best.gsub!("Best guess for this image:", "")
       result = "I believe this is a picture of: #{best}."
     end
-    result
   end
 end

data/pictate.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "pictate"
-  s.version = "0.1.3"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Adnan Abdulhussein"]
-  s.date = "2012-04-25"
+  s.date = "2012-04-28"
   s.description = "Pointless command line tool that attempts to describe the image you give it by automating a google search by image."
   s.email = "adnan@prydoni.us"
   s.executables = ["pictate"]
@@ -26,7 +26,6 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "bin/pictate",
-    "ext/.gitignore",
     "lib/pictate.rb",
     "pictate.gemspec",
     "test/helper.rb",
@@ -42,33 +41,30 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<selenium-webdriver>, ["~> 2.20"])
+      s.add_runtime_dependency(%q<selenium-webdriver>, ["~> 2.21.2"])
       s.add_runtime_dependency(%q<choice>, ["~> 0.1.6"])
-      s.add_runtime_dependency(%q<spinning_cursor>, ["~> 0.1.0.rc1"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
+      s.add_runtime_dependency(%q<spinning_cursor>, ["~> 0.1.2"])
+      s.add_development_dependency(%q<shoulda>, ["~> 3.0.0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, ["~> 1.1.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
-      s.add_development_dependency(%q<simplecov>, [">= 0"])
     else
-      s.add_dependency(%q<selenium-webdriver>, ["~> 2.20"])
+      s.add_dependency(%q<selenium-webdriver>, ["~> 2.21.2"])
       s.add_dependency(%q<choice>, ["~> 0.1.6"])
-      s.add_dependency(%q<spinning_cursor>, ["~> 0.1.0.rc1"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
+      s.add_dependency(%q<spinning_cursor>, ["~> 0.1.2"])
+      s.add_dependency(%q<shoulda>, ["~> 3.0.0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, ["~> 1.1.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
-      s.add_dependency(%q<simplecov>, [">= 0"])
     end
   else
-    s.add_dependency(%q<selenium-webdriver>, ["~> 2.20"])
+    s.add_dependency(%q<selenium-webdriver>, ["~> 2.21.2"])
     s.add_dependency(%q<choice>, ["~> 0.1.6"])
-    s.add_dependency(%q<spinning_cursor>, ["~> 0.1.0.rc1"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
+    s.add_dependency(%q<spinning_cursor>, ["~> 0.1.2"])
+    s.add_dependency(%q<shoulda>, ["~> 3.0.0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, ["~> 1.1.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
-    s.add_dependency(%q<simplecov>, [">= 0"])
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pictate
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-25 00:00:00.000000000 Z
+date: 2012-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.20'
+        version: 2.21.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.20'
+        version: 2.21.2
 - !ruby/object:Gem::Dependency
   name: choice
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.rc1
+        version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,23 +58,23 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.rc1
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -123,22 +123,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.8.3
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Pointless command line tool that attempts to describe the image you give
   it by automating a google search by image.
 email: adnan@prydoni.us
@@ -157,7 +141,6 @@ files:
 - Rakefile
 - VERSION
 - bin/pictate
-- ext/.gitignore
 - lib/pictate.rb
 - pictate.gemspec
 - test/helper.rb
@@ -177,7 +160,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3199460460875786531
+      hash: -1159349662437453405
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: