hoick 0.0.1 → 0.0.2

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YjJiNTY3M2ZhZTNmYmY0YTNmMTRjODg0ZmNhYjRjOTczM2MzMjMzYQ==
-  data.tar.gz: !binary |-
-    Y2U0NDVhOTAyYzhhZjM1MmY5NzY4ZTQ0YzMxMmUzN2FkMWZlNGFmNA==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    ZTZiNzllYTIyNTlhMDNhNzA4OTU5MTdmMmUwNDRhMzlhNjA1ZDFlZjA0ODM4
-    ZjU2YjE1NTRhYTZhODM3ZGU4MDJkZTM5NzAwMjNkZjg1NWZlYmRjMjgzYTAw
-    ZWJkODlhMmE5MWM0NTFjYmY2MjM3Yzk3YjM5NmIzNGMyMjU2Nzk=
-  data.tar.gz: !binary |-
-    ZmZkZDM0MWUzMDM3NTBhY2E5M2Y3YWRhYWE5MjljNWViMThkMTk1NDdmYzI0
-    MTY1YTFmNmE2ZWNkOTE4ZTA2OTliN2RjNjQwYmE5MzM5YzFkMTRhNjBlZTFj
-    ZDlmYTNhY2E1OTIyYjQ2YTBiN2M4Y2JlNTEyMTNjOTViZDQ1ZWY=
+SHA1:
+  metadata.gz: b2771b8314e1b92ef811e38eab01de8f9bd227c1
+  data.tar.gz: 561c3d1f37cdc2f8d43dc0581c96e3c6e21096cf
+SHA512:
+  metadata.gz: f3b958749de72a41427fac673f5997a4d626136a8144d1f5046657d9e7830f547956a233c34c09fc6076e6b433fc348f20cb28db6d12ea2aeb6546e6046697eb
+  data.tar.gz: 66bb7e6847cf8435f0f1f44d33df706146f09c0c16534745c1eae334f9bccc59e9afffca14488e0d41cef39af527338fd09844fd76d1b71602fcd95244a01b2b

data/hoick.gemspec

@@ -18,5 +18,6 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_runtime_dependency "mime-types", "~> 1.22"
+
 end

data/lib/hoick/command.rb

@@ -1,10 +1,13 @@
 require "clamp"
+require "mime/types"
 require "net/http"
 
 module Hoick
 
   class Command < Clamp::Command
 
+    option ["--base-url"], "URL", "base URL"
+
     option ["-b", "--[no-]body"], :flag, "display response body", :default => true
     option ["-h", "--[no-]headers"], :flag, "display response status and headers"
 
@@ -17,13 +20,13 @@ module Hoick
       parameter "URL", "address"
 
       def execute
-        get_with_redirects(url) do |response|
+        get_with_redirects do |response|
           display_response(response)
         end
       end
 
-      def get_with_redirects(url, &callback)
-        with_connection_to(url) do |http, uri|
+      def get_with_redirects(&callback)
+        with_http_connection do |http, uri|
           http.request_get(uri.request_uri) do |response|
             if follow? && response.kind_of?(Net::HTTPRedirection)
               get_with_redirects(response['location'], &callback)
@@ -36,37 +39,87 @@ module Hoick
 
     end
 
+    module PayloadOptions
+
+      extend Clamp::Option::Declaration
+
+      option ["-F", "--file"], "FILE", "input file"
+      option ["-T", "--content-type"], "TYPE", "payload Content-Type" do |arg|
+        if arg.index("/")
+          arg
+        else
+          mime_type_of(arg) || raise(ArgumentError, "unrecognised type: #{arg.inspect}")
+        end
+      end
+
+      def payload
+        if file
+          File.read(file)
+        else
+          $stdin.read
+        end
+      end
+
+      protected
+
+      def default_content_type
+        (mime_type_of(file) if file) ||  "application/octet-stream"
+      end
+
+      def mime_type_of(filename_or_ext)
+        resolved_type = MIME::Types.of(filename_or_ext).first
+        resolved_type.to_s if resolved_type
+      end
+
+    end
+
+    subcommand ["post", "POST"], "HTTP POST" do
+
+      include PayloadOptions
+
+      parameter "URL", "address"
+
+      def execute
+        content = payload
+        with_http_connection do |http, uri|
+          post = Net::HTTP::Post.new(uri.request_uri)
+          post["Content-Type"] = content_type
+          post.body = content
+          http.request(post) do |response|
+            display_response(response)
+          end
+        end
+      end
+
+    end
+
     subcommand ["put", "PUT"], "HTTP PUT" do
 
+      include PayloadOptions
+
       parameter "URL", "address"
-      parameter "[FILE]", "file to upload"
 
       def execute
-        content = read_content
-        with_connection_to(url) do |http, uri|
+        content = payload
+        with_http_connection do |http, uri|
           put = Net::HTTP::Put.new(uri.request_uri)
+          put["Content-Type"] = content_type
           put.body = content
-          put["Content-Type"] = "application/octet-stream"
           http.request(put) do |response|
             display_response(response)
           end
         end
       end
 
-      def read_content
-        if file
-          File.read(file)
-        else
-          $stdin.read
-        end
-      end
-
     end
 
     private
 
-    def with_connection_to(url)
-      uri = URI(url)
+    def uri
+      URI(base_url) + URI(url)
+    end
+
+    def with_http_connection
       http = Net::HTTP.new(uri.host, uri.port)
       http.set_debug_output($stderr) if debug?
       http.start do

data/lib/hoick/version.rb

@@ -1,3 +1,3 @@
 module Hoick
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: hoick
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Mike Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-28 00:00:00.000000000 Z
+date: 2013-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  name: mime-types
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
+        version: '1.22'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
+        version: '1.22'
 description: A command-line HTTP client
 email:
 - mdub@dogbiscuit.org
@@ -51,12 +51,12 @@ 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: []