ubalo 0.0.25 → 0.0.26

data/bin/ubalo

@@ -120,12 +120,11 @@ command :tasks do |c|
   end
 end
 
-def process_download pod_response, files_response, destination_path=nil
+def process_download pod_response, destination_path=nil
   name = pod_response.fetch('name')
   fullname = pod_response.fetch('fullname')
   url = pod_response.fetch('url')
-
-  files = files_response.fetch('files')
+  files = pod_response.fetch('files')
 
   destination_path ||= name
 
@@ -151,17 +150,17 @@ def process_download pod_response, files_response, destination_path=nil
   [fullname, destination_path]
 end
 
-desc 'Download a pod to your computer'
+desc 'Clone a pod to your computer'
 arg_name '<pod name>'
-command :get do |c|
+command :clone do |c|
   c.action do |global_options,options,args|
     pod_name = normalize_pod_name(args.shift)
     destination_path = args.shift
 
-    $stderr.print "Fetching files for #{pod_name}..."
-    pod_response, files_response = ubalo.download(pod_name)
+    $stderr.print "Fetching #{pod_name}..."
+    pod_response = ubalo.download(pod_name)
 
-    fullname, destination_path = process_download(pod_response, files_response)
+    fullname, destination_path = process_download(pod_response)
     $stderr.puts " done."
     $stderr.puts "Retrieved #{fullname} into #{destination_path}."
   end
@@ -211,7 +210,7 @@ command :create do |c|
     $stderr.print "Creating a new #{template_name} pod called #{pod_name}..."
     pod_response, files_response = ubalo.create_pod(pod_name, template_name)
 
-    fullname, destination_path = process_download(pod_response, files_response)
+    fullname, destination_path = process_download(pod_response)
 
     $stderr.puts " done."
     $stderr.puts "Created #{fullname} and placed in #{destination_path}/."
@@ -321,43 +320,6 @@ command :push do |c|
   end
 end
 
-desc 'Pull files from Ubalo'
-command :pull do |c|
-  c.action do |global_options,options,args|
-    print "Pulling changes from Ubalo..."
-    files = ubalo.pull(local_config.fetch('pod_url'))
-    puts " received."
-
-    filenames = local_config.fetch('filenames')
-
-    filenames.each do |filename|
-      if File.exists?(filename)
-        existing_content = File.read(filename)
-      else
-        existing_content = nil
-      end
-
-      if files.fetch(filename) == existing_content
-        puts "Checking #{filename}... no changes."
-      else
-        hl.choose do |menu|
-          menu.prompt = "Changes made to #{filename}. Overwrite your copy? "
-          menu.choice :yes do
-            open(filename, 'w') do |f|
-              f.write files.fetch(filename)
-            end
-            puts "Changes saved to #{filename}."
-          end
-
-          menu.choice :no do
-            puts "Cancelled! No changes made to #{filename}."
-          end
-        end
-      end
-    end
-  end
-end
-
 desc 'Enter username and password for access'
 command :login do |c|
   c.desc "Username"

data/lib/ubalo.rb

@@ -202,7 +202,7 @@ class Ubalo
   end
 
   def download(pod_name)
-    [get("#{base_url}/pods/#{pod_name}"), get_files(pod_name)]
+    get("#{base_url}/pods/#{pod_name}")
   end
 
   def pods
@@ -246,22 +246,11 @@ class Ubalo
   end
 
   def create_pod name, template
-    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")
+    post("#{base_url}/templates/#{template}/pods", :pod => {:name => name})
   end
 
   def push pod_url, files
-    raw_request(:put, "#{pod_url}/files", :files => files)
-  end
-
-  def pull pod_url
-    get("#{pod_url}/files")['files']
+    raw_request(:put, "#{pod_url}", :pod => {:files => files})
   end
 
   def check_task label

data/lib/ubalo/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ubalo
 version: !ruby/object:Gem::Version
-  version: 0.0.25
+  version: 0.0.26
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-19 00:00:00.000000000 Z
+date: 2012-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &70239715075580 !ruby/object:Gem::Requirement
+  requirement: &70360634350380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70239715075580
+  version_requirements: *70360634350380
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70239715060740 !ruby/object:Gem::Requirement
+  requirement: &70360634349740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70239715060740
+  version_requirements: *70360634349740
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70239715057820 !ruby/object:Gem::Requirement
+  requirement: &70360634348920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70239715057820
+  version_requirements: *70360634348920
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70239714982060 !ruby/object:Gem::Requirement
+  requirement: &70360634348040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: 1.6.3
   type: :runtime
   prerelease: false
-  version_requirements: *70239714982060
+  version_requirements: *70360634348040
 description: CLI and API client for Ubalo
 email: dev@ubalo.com
 executables: