imagebin 0.3.5 → 0.3.6

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 3
-:patch: 5
+:patch: 6

data/bin/take-screenshot

@@ -5,6 +5,9 @@
 # Requires: imagemagick, xmessage, and the imagebin script
 #
 
+require 'rubygems'
+require 'imagebin'
+
 # Location to save files
 working_dir = "/tmp"
 # Default delay before taking screenshots
@@ -13,7 +16,6 @@ delay = 3
 prefix = "screenshot"
 import = `which import`.chomp
 xmess = `which xmessage`.chomp
-imagebin = `which imagebin`.chomp
 
 # Check if the dir to store the screenshots exists, else create it: 
 Dir.mkdir(working_dir) if not File.exists?(working_dir)
@@ -21,8 +23,14 @@ Dir.mkdir(working_dir) if not File.exists?(working_dir)
 i = Dir.glob("#{working_dir}/#{prefix}.png").size + 1
 
 sleep delay
+
+# Take the screenshot with the 'import' command.
 system("#{import}", "-window", "root", "#{working_dir}/#{prefix}-#{i}.png")
-link = `#{imagebin} -p -l -f #{working_dir}/#{prefix}-#{i}.png`
-system("#{xmess}", "-nearmouse", "#{link}")
+
+ibin = Imagebin.new({ "f" => "#{working_dir}/#{prefix}-#{i}.png",
+                      "adult" => "t",
+                    })
+
+system("#{xmess}", "-nearmouse", "#{ibin.pic_link}")
 
 File.delete("#{working_dir}/#{prefix}-#{i}.png")

data/lib/imagebin.rb

@@ -20,10 +20,19 @@ class Imagebin
     #                        }) 
     #
     def initialize(options)
-        File.open(options["f"]) do |file|
-            options["f"] = file
+        @options = { "t" => "file",
+                     "name" => "",
+                     "tags" => "",
+                     "description" => "",
+                     "adult" => "f",
+                     "direct_link" => "0",
+                     "f" => "",
+        }
+        @options.merge!(options)
+        File.open(@options["f"]) do |file|
+            @options["f"] = file
             clnt = HTTPClient.new
-            res = clnt.post('http://imagebin.ca/upload.php', options).content
+            res = clnt.post('http://imagebin.ca/upload.php', @options).content
             @doc = Hpricot(res)
         end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: imagebin
 version: !ruby/object:Gem::Version 
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors: 
 - dougsko