haste 0.1.7 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35ecd77b0c99c20e84af80349307159f61188056
-  data.tar.gz: 6afd2dbe12aa5828f801154cbf4f7f59f9717dde
+  metadata.gz: e8d393fa8a36797aa277fe3502fe30cd962a8137
+  data.tar.gz: eebf771976a46c47799fa14e97f2364c2a57a712
 SHA512:
-  metadata.gz: 9e741f91d208c9c25ba18dfac316bd0a211928006651c8785d2b5108ecc8b8ac0682642a66270b4f155a1c8a0747350d77a0305d2f572d89337963ad97e91c1a
-  data.tar.gz: 375136cec75a90147bb61786fb634ac8faacbb9c84541d7418fdafd5f509571fac0d1c5481c97b04de3b692899bbc7ff0b2c0c85c8b1951e712af1c9e7b2fe6c
+  metadata.gz: 3aab22c47efba69d19b460d0c269401018bc67c37ae061c05ced7b481fc0255738cd239d366bbf12eec2abb249392f42c6465bdbfd881a0a3d7476c43f586a90
+  data.tar.gz: 8efa9bb61f312ab51948cb8da0d5253fb6a5c47facb857a6f9e5c4401e1f8e6d42cc6387d3f48a70f88ceab2800f93975a87f99b118a5b6473f40b4c89d96099

data/bin/haste

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 
+require 'bundler/setup'
+
 require 'pathname'
 path = Pathname.new(__FILE__)
 require File.expand_path(File.dirname(path.realpath) + '/../lib/haste')

data/lib/haste.rb

@@ -1,59 +1,6 @@
-require 'json'
-require 'net/http'
-require 'net/https'
-require 'uri'
+require File.dirname(__FILE__) + '/haste/uploader'
+require File.dirname(__FILE__) + '/haste/exception'
+require File.dirname(__FILE__) + '/haste/cli'
 
 module Haste
-
-  DEFAULT_URL = 'http://hastebin.com'
-
-  class CLI
-
-    # Pull all of the data from STDIN
-    def initialize
-      if STDIN.tty?
-        file = ARGV.first
-        abort 'No input file given' unless file
-        abort "#{file}: No such path" unless File.exists?(file)
-        @input = open(file).read
-      else
-        @input = STDIN.readlines.join
-      end
-      # clean up
-      @input.rstrip!
-    end
-
-    # Upload the and output the URL we get back
-    def start
-      uri = URI.parse server
-      http = Net::HTTP.new uri.host, uri.port
-      if uri.scheme =~ /^https/
-        http.use_ssl = true
-        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-      end
-      response = http.post '/documents', @input
-      if response.is_a?(Net::HTTPOK)
-        data = JSON.parse(response.body)
-        method = STDOUT.tty? ? :puts : :print
-        STDOUT.send method, "#{server}/#{data['key']}"
-      else
-        abort "failure uploading: #{response.code}"
-      end
-    rescue JSON::ParserError => e
-      abort "failure parsing response: #{e.message}"
-    rescue Errno::ECONNREFUSED => e
-      abort "failure connecting: #{e.message}"
-    end
-
-    private
-
-    def server
-      return @server if @server
-      @server = (ENV['HASTE_SERVER'] || Haste::DEFAULT_URL).dup
-      @server.chop! if server.end_with?('/')
-      @server
-    end
-
-  end
-
 end

data/lib/haste/cli.rb

@@ -0,0 +1,36 @@
+module Haste
+
+  class CLI
+
+    # Create a new uploader
+    def initialize
+      @uploader = Uploader.new ENV['HASTE_SERVER']
+    end
+
+    # And then handle the basic usage
+    def start
+      # Take data in
+      if STDIN.tty?
+        key = @uploader.upload_path ARGV.first
+      else
+        key = @uploader.upload_raw STDIN.readlines.join
+      end
+      # Put together a URL
+      if ARGV.include?('--raw')
+        url = "#{@uploader.server_url}/raw/#{key}"
+      else
+        url = "#{@uploader.server_url}/#{key}"
+      end
+      # And write data out
+      if STDOUT.tty?
+        STDOUT.puts url
+      else
+        STDOUT.print url
+      end
+    rescue Exception => e
+      abort e.message
+    end
+
+  end
+
+end

data/lib/haste/exception.rb

@@ -0,0 +1,4 @@
+module Haste
+  class Exception < StandardError
+  end
+end

data/lib/haste/uploader.rb

@@ -0,0 +1,59 @@
+require 'json'
+require 'faraday'
+
+module Haste
+
+  DEFAULT_URL = 'http://hastebin.com'
+
+  class Uploader
+
+    attr_reader :server_url
+
+    def initialize(server_url = nil)
+      @server_url = server_url || Haste::DEFAULT_URL
+      @server_url = @server_url.dup
+      @server_url = @server_url.chop if @server_url.end_with?('/')
+    end
+
+    # Take in a path and return a key
+    def upload_path(path)
+      fail_with 'No input file given' unless path
+      fail_with "#{path}: No such path" unless File.exists?(path)
+      upload_raw open(path).read
+    end
+
+    # Take in data and return a key
+    def upload_raw(data)
+      data.rstrip!
+      response = do_post data
+      if response.status == 200
+        data = JSON.parse(response.body)
+        data['key']
+      else
+        fail_with "failure uploading: #{response.body}"
+      end
+    rescue JSON::ParserError => e
+      fail_with "failure parsing response: #{e.message}"
+    rescue Errno::ECONNREFUSED => e
+      fail_with "failure connecting: #{e.message}"
+    end
+
+    private
+
+    def do_post(data)
+      connection.post('/documents', data)
+    end
+
+    def connection
+      @connection ||= Faraday.new(:url => server_url) do |c|
+        c.adapter Faraday.default_adapter
+      end
+    end
+
+    def fail_with(msg)
+      raise Exception.new(msg)
+    end
+
+  end
+
+end

data/lib/haste/version.rb

@@ -1,5 +1,5 @@
 module Haste
 
-  VERSION = '0.1.7'
+  VERSION = '0.2.0'
 
 end

data/spec/spec_helper.rb

@@ -0,0 +1,2 @@
+require 'bundler/setup'
+require File.dirname(__FILE__) + '/../lib/haste'

metadata

@@ -1,41 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: haste
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.2.0
 platform: ruby
 authors:
 - John Crepezzi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-08 00:00:00.000000000 Z
+date: 2014-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: CLI Haste Client
@@ -45,9 +59,13 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/haste/version.rb
-- lib/haste.rb
 - bin/haste
+- lib/haste.rb
+- lib/haste/cli.rb
+- lib/haste/exception.rb
+- lib/haste/uploader.rb
+- lib/haste/version.rb
+- spec/spec_helper.rb
 homepage: 
 licenses: []
 metadata: {}
@@ -57,18 +75,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Haste Client
-test_files: []
+test_files:
+- spec/spec_helper.rb