ubalo 0.0.23 → 0.0.24

data/bin/ubalo

@@ -120,11 +120,13 @@ command :tasks do |c|
   end
 end
 
-def process_download response, destination_path=nil
-  name = response.fetch('name')
-  fullname = response.fetch('fullname')
-  url = response.fetch('url')
-  files = response.fetch('files')
+def process_download pod_response, files_response, destination_path=nil
+  name = pod_response.fetch('name')
+  fullname = pod_response.fetch('fullname')
+  url = pod_response.fetch('url')
+
+  files = files_response.fetch('files')
+
   destination_path ||= name
 
   if File.exists?(destination_path)
@@ -142,7 +144,7 @@ def process_download response, destination_path=nil
     local_filename = File.join(destination_path, filename)
     FileUtils.mkdir_p(File.dirname(local_filename))
     File.open(local_filename, "w") do |f|
-      f.puts content
+      f.write content
     end
   end
 
@@ -157,9 +159,9 @@ command :get do |c|
     destination_path = args.shift
 
     $stderr.print "Fetching files for #{pod_name}..."
-    response = ubalo.download(pod_name)
+    pod_response, files_response = ubalo.download(pod_name)
 
-    fullname, destination_path = process_download(response)
+    fullname, destination_path = process_download(pod_response, files_response)
     $stderr.puts " done."
     $stderr.puts "Retrieved #{fullname} into #{destination_path}."
   end
@@ -207,9 +209,9 @@ command :create do |c|
     end
 
     $stderr.print "Creating a new #{template_name} pod called #{pod_name}..."
-    response = ubalo.create_pod(pod_name, template_name)
+    pod_response, files_response = ubalo.create_pod(pod_name, template_name)
 
-    fullname, destination_path = process_download(response)
+    fullname, destination_path = process_download(pod_response, files_response)
 
     $stderr.puts " done."
     $stderr.puts "Created #{fullname} and placed in #{destination_path}/."
@@ -323,7 +325,7 @@ command :pull do |c|
           menu.prompt = "Changes made to #{filename}. Overwrite your copy? "
           menu.choice :yes do
             open(filename, 'w') do |f|
-              f.puts files.fetch(filename)
+              f.write files.fetch(filename)
             end
             puts "Changes saved to #{filename}."
           end

data/lib/ubalo.rb

@@ -131,19 +131,22 @@ class Ubalo
     @base_url = base_url
   end
 
-  def request(method, url, params)
+  def raw_request(method, url, params)
     if method == :get
-      response = RestClient.get url, add_headers(:params => params, :accept => :json)
+      RestClient.get url, add_headers(:params => params, :accept => :json)
     elsif method == :post
-      response = RestClient.post url, params, add_headers(:accept => :json)
+      RestClient.post url, params, add_headers(:accept => :json)
     elsif method == :put
-      response = RestClient.put url, params, add_headers(:accept => :json)
+      RestClient.put url, params, add_headers(:accept => :json)
     elsif method == :delete
-      response = RestClient.delete url, add_headers(:accept => :json)
+      RestClient.delete url, add_headers(:accept => :json)
     else
       raise "don't understand request method #{method.inspect}"
     end
-    parse(response)
+  end
+
+  def request(method, url, params)
+    parse(raw_request(method, url, params))
   end
 
   def post(url, params={})
@@ -199,7 +202,7 @@ class Ubalo
   end
 
   def download(pod_name)
-    get("#{base_url}/pods/#{pod_name}/files")
+    [get("#{base_url}/pods/#{pod_name}"), get_files(pod_name)]
   end
 
   def pods
@@ -243,11 +246,18 @@ class Ubalo
   end
 
   def create_pod name, template
-    post("#{base_url}/templates/#{template}/pods", :pod => {:name => name})
+    pod_response = post("#{base_url}/templates/#{template}/pods", :pod => {:name => name})
+    files_response = get_files(pod_response.fetch('fullname'))
+
+    [pod_response, files_response]
+  end
+
+  def get_files fullname
+    get("#{base_url}/pods/#{fullname}/files")
   end
 
   def push pod_url, files
-    post("#{pod_url}/files", :files => files)
+    raw_request(:put, "#{pod_url}/files", :files => files)
   end
 
   def pull pod_url

data/lib/ubalo/version.rb

@@ -1,5 +1,5 @@
 class Ubalo
   unless const_defined?('VERSION')
-    VERSION = "0.0.23"
+    VERSION = "0.0.24"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ubalo
 version: !ruby/object:Gem::Version
-  version: 0.0.23
+  version: 0.0.24
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-14 00:00:00.000000000 Z
+date: 2012-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &70245226856660 !ruby/object:Gem::Requirement
+  requirement: &70365296916080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70245226856660
+  version_requirements: *70365296916080
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70245226856180 !ruby/object:Gem::Requirement
+  requirement: &70365296914740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70245226856180
+  version_requirements: *70365296914740
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70245226855760 !ruby/object:Gem::Requirement
+  requirement: &70365296913720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70245226855760
+  version_requirements: *70365296913720
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70245226855240 !ruby/object:Gem::Requirement
+  requirement: &70365296909400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: 1.6.3
   type: :runtime
   prerelease: false
-  version_requirements: *70245226855240
+  version_requirements: *70365296909400
 description: CLI and API client for Ubalo
 email: dev@ubalo.com
 executables:
@@ -90,3 +90,4 @@ signing_key:
 specification_version: 3
 summary: CLI and API client for Ubalo
 test_files: []
+has_rdoc: