imagebin 0.3.6 → 1.0.2

data/README.rdoc

@@ -1,17 +1,21 @@
 = imagebin
 
-imagebin is a CLI to http://imagebin.ca
+imagebin is a CLI to http://imgur.com
+This program looks for your API key in ~/.imgur.yaml
+
     Example: imagebin -f <pic.png>
 
 Options:
     -f, --file <file>                Use a file for input
-    -n, --name [name]                Name
-    -t, --tags [tags]                Comma separated
-    -d, --description [description]  Description
-    -p, --private                    Private
-    -l, --link                       Direct link to picture file
     -h, --help                       Show this message
 
+
+Here is an example of what ~/.imgur.yaml should look like:
+
+--- 
+key: 543e908c545620bd1c44d43edf3a35a0
+
+
 == Copyright
 
 Copyright (c) 2009 dougsko. See LICENSE for details.

data/Rakefile

@@ -5,12 +5,12 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "imagebin"
-    gem.summary = %Q{Command line interface to imagebin.ca}
+    gem.summary = %Q{Command line interface to imgur.com}
     gem.email = "dougtko@gmail.com"
     gem.homepage = "http://github.com/dougsko/imagebin"
     gem.authors = ["dougsko"]
     gem.add_dependency 'httpclient'
-    gem.description = 'Command line interface to imagebin.ca'
+    gem.description = 'Command line interface to imgur.com'
     gem.require_paths = ['/bin', '/lib']
     gem.files = FileList["[A-Z]*", "{bin,generators,lib,spec}/**/*"]
     gem.add_dependency "hpricot"
@@ -39,7 +39,7 @@ end
 task :default => :spec
 
 require 'rake/rdoctask'
-require 'darkfish-rdoc'
+#require 'darkfish-rdoc'
 Rake::RDocTask.new do |rdoc|
   if File.exist?('VERSION.yml')
     config = YAML.load(File.read('VERSION.yml'))
@@ -54,7 +54,7 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
   rdoc.options += [
           '-N',
-          '-f', 'darkfish',
+#          '-f', 'darkfish',
   ]
 end
 

data/VERSION.yml

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

data/bin/imagebin

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 #
 #
-# CLI to imagebin.ca
+# CLI to imgur.com
 #
 # Copyright (C) 2009 dougsko
 # 
@@ -23,43 +23,19 @@ require 'rubygems'
 require 'optparse'
 require 'imagebin'
 
-options = { "t" => "file", 
-            "name" => "", 
-            "tags" => "", 
-            "description" => "", 
-            "adult" => "f",
-            "direct_link" => "0",
+options = { "image" => "file", 
+            "key" => "",
 }
 
 opts = OptionParser.new do |opts|
-    opts.banner =  "imagebin is a CLI to http://imagebin.ca
+    opts.banner =  "imagebin is a CLI to http://imgur.com
     Example: imagebin -f <pic.png>" 
 
     opts.separator ""
     opts.separator "Options:"
 
     opts.on("-f <file>", "--file <file>", String, "Use a file for input") do |file|
-        options["f"] = file
-    end
-
-    opts.on("-n [name]", "--name [name]", String, "Name") do |n|
-        options["name"] = n
-    end
-
-    opts.on("-t [tags]", "--tags [tags]", String, "Comma separated") do |tags|
-        options["tags"] = tags
-    end
-
-    opts.on("-d [description]", "--description [description]", String, "Description") do |desc|
-        options["description"] = desc
-    end
-
-    opts.on("-p", "--private", "Private") do |priv|
-        options["adult"] = "t"
-    end
-
-    opts.on("-l", "--link", "Direct link to picture file") do |direct_link|
-        options["direct_link"] = "1"
+        options["image"] = file
     end
 
     opts.on_tail("-h", "--help", "Show this message") do
@@ -70,12 +46,8 @@ end
 
 opts.parse(ARGV)
 
-if options["direct_link"] == "0"
-    options.delete("direct_link")
-    ibin = Imagebin.new(options)
-    puts ibin.site_link
-elsif options["direct_link"] == "1"
-    options.delete("direct_link")
-    ibin = Imagebin.new(options)
-    puts ibin.pic_link
-end
+conf = YAML.load_file("#{ENV['HOME']}/.imgur.yaml")
+options['key'] = conf['key']
+ibin = Imagebin.new(options)
+puts ibin.original_image
+

data/bin/take-screenshot

@@ -27,10 +27,11 @@ sleep delay
 # Take the screenshot with the 'import' command.
 system("#{import}", "-window", "root", "#{working_dir}/#{prefix}-#{i}.png")
 
-ibin = Imagebin.new({ "f" => "#{working_dir}/#{prefix}-#{i}.png",
-                      "adult" => "t",
+conf = YAML.load_file("#{ENV['HOME']}/.imgur.yaml")
+ibin = Imagebin.new({ "image" => "#{working_dir}/#{prefix}-#{i}.png",
+                      "key" => conf['key'],
                     })
 
-system("#{xmess}", "-nearmouse", "#{ibin.pic_link}")
+system("#{xmess}", "-nearmouse", "#{ibin.original_image}")
 
 File.delete("#{working_dir}/#{prefix}-#{i}.png")

data/lib/imagebin.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #
-# imagebin.ca class
+# imgur.com API
 #
 
 require 'rubygems'
@@ -8,51 +8,46 @@ require 'httpclient'
 require 'hpricot'
 
 class Imagebin
-    # This method takes a hash containing the variables in the POST
-    # request.
-    #
-    #   ibin = Imagebin.new( { "t" => "file",
-    #                          "name" => "",
-    #                          "tags" => "",
-    #                          "description" => "",
-    #                          "adult" => "f",
-    #                          "f" => "file_path",
-    #                        }) 
-    #
     def initialize(options)
-        @options = { "t" => "file",
-                     "name" => "",
-                     "tags" => "",
-                     "description" => "",
-                     "adult" => "f",
-                     "direct_link" => "0",
-                     "f" => "",
+        @options = { "image" => "file",
+                     "key" => "api_key",
         }
         @options.merge!(options)
-        File.open(@options["f"]) do |file|
-            @options["f"] = file
+        File.open(@options["image"]) do |file|
+            @options["image"] = file
             clnt = HTTPClient.new
-            res = clnt.post('http://imagebin.ca/upload.php', @options).content
+            res = clnt.post('http://imgur.com/api/upload.xml', @options).content
             @doc = Hpricot(res)
+            raise @doc.at('error_msg').innerHTML if @doc.at('error_msg') != nil
         end
     end
 
-    # Returns the link to the HTML site of the post.
-    #
-    #   ibin.site_link    #=> "http://imagebin.ca/view/xxxxxxx.html"
-    #
-    def site_link
-        @doc.at("a").innerHTML
+    def image_hash
+        @doc.at('image_hash').innerHTML
     end
 
-    # Returns the direct link to the file posted.
-    #
-    #   ibin.pic_link    #=> "http://imagebin.ca/img/xxxxxxx.jpg"
-    #
-    def pic_link
-        clnt = HTTPClient.new
-        res = clnt.get(@doc.at("a").innerHTML).content
-        doc = Hpricot(res)
-        doc.at("#theimg")["src"]
+    def delete_hash
+        @doc.at('delete_hash').innerHTML
     end
+
+    def original_image
+        @doc.at("original_image").innerHTML
+    end
+
+    def large_thumbnail
+        @doc.at('large_thumbnail').innerHTML
+    end
+
+    def small_thumbnail
+        @doc.at('small_thumbnail').innerHTML
+    end
+
+    def imgur_page
+        @doc.at('imgur_page').innerHTML
+    end
+
+    def delete_page
+        @doc.at('delete_page').innerHTML
+    end
+
 end

data/spec/imagebin_spec.rb

@@ -2,23 +2,19 @@ require 'spec_helper'
 
 describe "Imagebin" do
     before do
-        options = { "t" => "file",
-                    "name" => "",
-                    "tags" => "",
-                    "description" => "",
-                    "adult" => "t",
-                    "f" => "spec/ZGrass04.jpg",
+        @options = { "image" => "spec/ZGrass04.jpg",
+                     "key" => "926e908c545620bd1c44d43edf3a35a0",
         }
-        @ibin = Imagebin.new(options)
-    end
-
-    it "should return a link to the paste's website" do
-        link = @ibin.site_link
-        link.should match(/html/)
     end
 
     it "should return a link to the picture file" do
-        link = @ibin.pic_link
+        ibin = Imagebin.new(@options)
+        link = ibin.original_image
         link.should match(/jpg/)
     end
+
+    it "should raise an error" do
+        @options['key'] = ''
+        lambda {Imagebin.new(@options)}.should raise_error(RuntimeError)
+    end
 end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: imagebin
 version: !ruby/object:Gem::Version 
-  version: 0.3.6
+  hash: 19
+  prerelease: false
+  segments: 
+  - 1
+  - 0
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - dougsko
@@ -9,40 +15,52 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-26 00:00:00 -05:00
+date: 2010-08-09 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: httpclient
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: hpricot
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: httpclient
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
-description: Command line interface to imagebin.ca
+  type: :runtime
+  version_requirements: *id003
+description: Command line interface to imgur.com
 email: dougtko@gmail.com
 executables: 
 - take-screenshot
@@ -74,24 +92,30 @@ require_paths:
 - /bin
 - /lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Command line interface to imagebin.ca
+summary: Command line interface to imgur.com
 test_files: 
 - spec/imagebin_spec.rb
 - spec/spec_helper.rb