releaseable 0.0.6 → 0.0.7

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

data/lib/releaseable/extensions.rb

@@ -71,7 +71,6 @@ class Logger
     @config[:time_format] ||= @config[:time] || '%M:%S.%N'
 
     unless @config[:ignore] # fatal errors
-      @config[:progname] = config[:progname] || ''
       @config[:tag] = config[:tag] || config[:name] || config[:connection] && config[:env] ?
           "#{config[:env]}#{config[:connection][:client_id]}" : "Tag#{rand(10000)}"
       input = case @config[:input]

data/lib/releaseable/github.rb

@@ -1,33 +1,15 @@
 #require 'httpclient'
-#require 'net/http'
+require 'net/http'
+require 'net/https'
 require 'xmlsimple'
-require 'faraday'
-require 'faraday_middleware'
 require 'json'
 
 module Releaseable
   module GitHub
 
-    #OpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE
-
-    def self.connection
-      Faraday.new(:ssl => {:verify => false}) do |connection|
-        connection.use Faraday::Request::UrlEncoded
-        connection.use Faraday::Response::Logger
-        connection.adapter(Faraday.default_adapter)
-      end
-    end
-
-    #def self.get address #, data
-    #  connection.get address
-    #end
-    #
-    #def self.post address, data
-    #  connection.post address, data
-    #end
+    OpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE
 
     def self.post address, data
-      require 'net/http'
       p uri = URI(address) #'https://secure.example.com/some_path?query=string')
 
       #Net::HTTP.start(uri.host, uri.port,
@@ -43,6 +25,7 @@ module Releaseable
       server = Net::HTTP.new(uri.host, uri.port)
       server.use_ssl = (uri.scheme == 'https')
       server.verify_mode = OpenSSL::SSL::VERIFY_NONE if server.use_ssl?
+
       server.start do |http|
         req = Net::HTTP::Post.new(uri.path)
         case data
@@ -54,8 +37,6 @@ module Releaseable
         end
         http.request(req)
       end
-      #rescue => err
-      #  p err
     end
 
     def self.upload info = {}
@@ -71,7 +52,7 @@ module Releaseable
       if info[:file]
         file = info[:file]
         raise "bad file #{info[:file]}" unless File.exist?(file) && File.readable?(file)
-        info[:name] ||= File.basename(file) + rand(1000).to_s
+        info[:name] ||= File.basename(file)  + rand(1000).to_s
       end
 
       raise "required name for filename with data parameter" unless info[:name]
@@ -85,83 +66,76 @@ module Releaseable
                       'description' => info[:description] || '',
                       'login' => info[:login],
                       'token' => info[:token]
-
+      #p response.body
       raise "Failed to post file info" unless response.code.to_i == 200 #status == 200
 
-      puts upload = JSON.parse(response.body)
-      upload.each { |k, v| print "#{k}:"; p v }
-      p upload['expirationdate']
-      p Time.utc *upload['expirationdate'].split(/[-T:]/)
-      sec = Time.utc(*upload['expirationdate'].split(/[-T:]/)).to_i
+      upload = JSON.parse(response.body)
 
-      f = File.open(info[:file], 'rb')
+      #upload.each { |k, v| print "#{k}:"; p v }
+      #sec = Time.utc(*upload['expirationdate'].split(/[-T:]/)).to_i
 
-      ##stat = HTTPClient.post("http://github.s3.amazonaws.com/", [
-      response = post "http://github.s3.amazonaws.com/",
-                      'key' => upload['path'], #.gsub(/\//, '%2F'),
-                      'acl' => upload['acl'], #"public-read", #
-                      'success_action_status' => 201,
-                      'Filename' => info[:name],
-                      'AWSAccessKeyId' => upload['accesskeyid'],
-                      'Policy' => upload['policy'],
-                      #'policy' => upload['policy'],
-                      #'signature' => upload['signature'],
-                      'Signature' => upload['signature'],
-                      'Expires' => 1483421360, #sec, #upload['expirationdate'],
-                      'Content-Type' => upload['mime_type'] || 'application/octet-stream',
-                      'file' => f
+      curl = "curl -F \"key=#{upload['path']}\" -F \"acl=#{upload['acl']}\" " +
+          "-F \"success_action_status=201\" -F \"Filename=#{info[:name]}\" " +
+          "-F \"AWSAccessKeyId=#{upload['accesskeyid']}\" -F \"Policy=#{upload['policy']}\" "+
+          "-F \"Signature=#{upload['signature']}\" -F \"Content-Type=application/octet-stream\" "+
+          "-F \"file=@#{info[:file]}\" https://github.s3.amazonaws.com/"
+
+      response = `#{curl}`
+
+      analyze_curl_response response
+
+      #f = File.open(info[:file], 'rb')
+      ###stat = HTTPClient.post("http://github.s3.amazonaws.com/", [
       #response = post "http://github.s3.amazonaws.com/",
-      #                'Filename' => info[:name],
-      #                'policy' => upload['policy'],
+      #                'key' => upload['path'], #.gsub(/\//, '%2F'),
+      #                'acl' => upload['acl'], #"public-read", #
       #                'success_action_status' => 201,
-      #                'key' => upload['path'].gsub(/\//, '%2F'),
+      #                'Filename' => info[:name],
       #                'AWSAccessKeyId' => upload['accesskeyid'],
+      #                'Policy' => upload['policy'],
+      #                #'policy' => upload['policy'],
+      #                #'signature' => upload['signature'],
+      #                'Signature' => upload['signature'],
+      #                'Expires' => 1483421360, #sec, #upload['expirationdate'],
       #                'Content-Type' => upload['mime_type'] || 'application/octet-stream',
-      #                'signature' => upload['signature'],
-      #                'acl' => upload['acl'],   #"public-read", #
       #                'file' => f
-
-      #stat = HTTPClient.post("http://github.s3.amazonaws.com/", [
-      #    ['Filename', info[:name]],
-      #    ['policy', upload_info['policy']],
-      #    ['success_action_status', 201],
-      #    ['key', upload_info['path']],
-      #    ['AWSAccessKeyId', upload_info['accesskeyid']],
-      #    ['Content-Type', upload_info['content_type'] || 'application/octet-stream'],
-      #    ['signature', upload_info['signature']],
-      #    ['acl', upload_info['acl']],
-      #    ['file', f]
-      #])
-
-      #url = 'https://github.s3.amazonaws.com/'
-      #form = {
-      #    'key': 'downloads/octocat/Hello-World/new_file.jpg',
-      #    'acl': 'public-read',
-      #    'file': '@new_file.jpg'
-      #}
+      ##response = post "http://github.s3.amazonaws.com/",
+      ##                'Filename' => info[:name],
+      ##                'policy' => upload['policy'],
+      ##                'success_action_status' => 201,
+      ##                'key' => upload['path'].gsub(/\//, '%2F'),
+      ##                'AWSAccessKeyId' => upload['accesskeyid'],
+      ##                'Content-Type' => upload['mime_type'] || 'application/octet-stream',
+      ##                'signature' => upload['signature'],
+      ##                'acl' => upload['acl'],   #"public-read", #
+      ##                'file' => f
       #
-      #r = requests.post(url, data=form)
-
-      # curl \
-      #   -F "key=downloads/octocat/Hello-World/new_file.jpg" \
-      #   -F "acl=public-read" \
-      #   -F "success_action_status=201" \
-      #   -F "Filename=new_file.jpg" \
-      #   -F "AWSAccessKeyId=1ABCDEF..." \
-      #   -F "Policy=ewogIC..." \
-      #   -F "Signature=mwnF..." \
-      #   -F "Content-Type=image/jpeg" \
-      #   -F "file=@new_file.jpg" \
-      #https://github.s3.amazonaws.com/
-
-
-      f.close
-
-      analyze_aws_response response
+      ##stat = HTTPClient.post("http://github.s3.amazonaws.com/", [
+      ##    ['Filename', info[:name]],
+      ##    ['policy', upload_info['policy']],
+      ##    ['success_action_status', 201],
+      ##    ['key', upload_info['path']],
+      ##    ['AWSAccessKeyId', upload_info['accesskeyid']],
+      ##    ['Content-Type', upload_info['content_type'] || 'application/octet-stream'],
+      ##    ['signature', upload_info['signature']],
+      ##    ['acl', upload_info['acl']],
+      ##    ['file', f]
+      ##])
+      #f.close
+      #analyze_aws_response response
     end
 
     private
 
+    def self.analyze_curl_response response
+      message = XmlSimple.xml_in(response)
+      if message['Location']
+        message['Location'].first
+      else
+        raise "Failed to upload to AWS" + (" due to #{message}" rescue '')
+      end
+    end
+
     def self.analyze_aws_response response
       p message = XmlSimple.xml_in(response.body)
       if response.code.to_i == 201

metadata

@@ -2,7 +2,7 @@
 name: releaseable
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
   - arvicco