package_cloud 0.1.0 → 0.1.1

data/lib/package_cloud/config_file.rb

@@ -1,20 +1,22 @@
 require "highline/import"
 require "json"
+require "uri"
+require "cgi"
 
 module PackageCloud
   class ConfigFile
     attr_reader :token
 
-    def initialize(filename = "~/.packagecloud", url = "packagecloud.io")
+    def initialize(filename = "~/.packagecloud", url = "https://packagecloud.io")
       @filename = File.expand_path(filename)
-      @url = url
+      @url = URI(url)
     end
 
     def read_or_create
       if File.exist?(@filename)
         attrs = JSON.parse(File.read(@filename))
         @token = attrs["token"] if attrs.has_key?("token")
-        @url   = attrs["url"] if attrs.has_key?("url")
+        @url   = URI(attrs["url"]) if attrs.has_key?("url")
       else
         puts "No config file exists at #{@filename}. Login to create one."
 
@@ -24,11 +26,14 @@ module PackageCloud
     end
 
     def url
-      @url ||= "packagecloud.io"
+      @url ||= URI("https://packagecloud.io")
     end
 
     def base_url(username = token, password = "")
-      "http://#{CGI.escape(username)}:#{CGI.escape(password)}@#{url}"
+      u = url.dup
+      u.user = CGI.escape(username)
+      u.password = CGI.escape(password)
+      u.to_s
     end
 
     private
@@ -46,7 +51,7 @@ module PackageCloud
 
       def write
         print "Got your token. Writing a config file to #{@filename}... "
-        attrs = {url: @url, token: @token}
+        attrs = {url: url.to_s, token: @token}
         File.open(@filename, "w", 0600) { |f| f << JSON.dump(attrs); f << "\r\n" }
         puts "success!"
       end

data/lib/package_cloud/version.rb

@@ -1,3 +1,3 @@
 module PackageCloud
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -2,7 +2,7 @@
 name: package_cloud
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - James Golick
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-02-24 00:00:00 Z
+date: 2014-02-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thor