ubalo 0.0.27 → 0.0.28

data/bin/ubalo

@@ -55,6 +55,8 @@ def normalize_pod_name(pod_name)
     else
       "#{local_username}/#{pod_name}"
     end
+  else
+    raise UbaloMessage, "Please specify a pod name"
   end
 end
 
@@ -123,8 +125,8 @@ end
 def process_download pod_response, destination_path=nil
   name = pod_response.fetch('name')
   fullname = pod_response.fetch('fullname')
-  url = pod_response.fetch('url')
-  files = pod_response.fetch('files')
+  pod_url = pod_response.fetch('url')
+  files_url = pod_response.fetch('archive').fetch('get_url')
 
   destination_path ||= name
 
@@ -135,16 +137,10 @@ def process_download pod_response, destination_path=nil
   FileUtils.mkdir(destination_path)
   FileUtils.mkdir(File.join(destination_path, ".ubalo"))
 
-  File.open(File.join(destination_path, ".ubalo", "config"), "w") do |f|
-    f.puts(YAML.dump("pod_url" => url))
-  end
+  ubalo.retrieve_files(destination_path, files_url)
 
-  files.each do |filename,content|
-    local_filename = File.join(destination_path, filename)
-    FileUtils.mkdir_p(File.dirname(local_filename))
-    File.open(local_filename, "w") do |f|
-      f.write content
-    end
+  File.open(File.join(destination_path, ".ubalo", "config"), "w") do |f|
+    f.puts(YAML.dump("pod_url" => pod_url))
   end
 
   [fullname, destination_path]
@@ -158,62 +154,10 @@ command :clone do |c|
     destination_path = args.shift
 
     $stderr.print "Fetching #{pod_name}..."
-    pod_response = ubalo.download(pod_name)
-
-    fullname, destination_path = process_download(pod_response)
-    $stderr.puts " done."
-    $stderr.puts "Retrieved #{fullname} into #{destination_path}."
-  end
-end
-
-desc 'Create a new pod'
-arg_name '<pod name>'
-command :create do |c|
-
-  c.desc "Pod name"
-  c.flag :name
-  c.desc "Pod template"
-  c.flag :template
-
-  c.action do |global_options,options,args|
-    # Request available templates first to provoke 403 if not logged-in
-    # properly.
-    templates = ubalo.available_templates
-    template_names = templates.map{|t| t['name']}.sort
-
-    if options.name
-      pod_name = options.name
-    else
-      pod_name = hl.ask("New pod name: ")
-      if pod_name.empty?
-        raise UbaloMessage, "No pod name given"
-      end
-    end
-    destination_path = pod_name
-
-    if File.exists?(pod_name)
-      raise UbaloMessage, "directory #{destination_path} already exists, giving up."
-    end
-
-    if options['template']
-      template_name = options['template']
-      unless template_names.include? template_name
-        raise UbaloMessage, "Invalid template name"
-      end
-    else
-      template_name = hl.choose do |menu|
-        menu.prompt = "Template for your new pod: "
-        menu.choices(*template_names)
-      end
-    end
-
-    $stderr.print "Creating a new #{template_name} pod called #{pod_name}..."
-    pod_response, files_response = ubalo.create_pod(pod_name, template_name)
+    pod_response = ubalo.clone(pod_name)
 
     fullname, destination_path = process_download(pod_response)
-
-    $stderr.puts " done."
-    $stderr.puts "Created #{fullname} and placed in #{destination_path}/."
+    $stderr.puts " saved to #{destination_path}."
   end
 end
 
@@ -286,34 +230,25 @@ command :check do |c|
   end
 end
 
-desc 'Push files to Ubalo'
-command :push do |c|
+desc 'Pushes a pod directory directly to Ubalo'
+command :push_to do |c|
   c.action do |global_options,options,args|
-    pod_url = local_config.fetch('pod_url')
-
-    if File.exist?(".ubaloignore")
-      ignore_patterns = File.read(".ubaloignore").each_line.map(&:strip)
-    else
-      ignore_patterns = []
-    end
-
-    ignore_patterns += %w{. .. .ubalo}
-
-    filenames = []
-    Dir.glob('{.**,**}').each do |path|
-      next if ignore_patterns.any?{|pattern| File.fnmatch?(pattern, path, File::FNM_DOTMATCH)}
+    pod_name = normalize_pod_name(args.shift)
 
-      filenames << path
-    end
+    # First ensure that the pod exists.
+    pod_url = "#{ubalo.base_url}/pods/#{pod_name}"
+    pod = ubalo.create_or_update(pod_url)
 
-    files = {}
-    filenames.each do |filename|
-      files[filename] = File.read(filename)
-    end
+    # Now push the files archive.
+    ubalo.push_files(pod_url)
+  end
+end
 
-    print "Uploading changes... "
-    result = ubalo.push(pod_url, files)
-    puts "Code changes saved."
+desc 'Push files to Ubalo'
+command :push do |c|
+  c.action do |global_options,options,args|
+    pod_url = local_config.fetch('pod_url')
+    ubalo.push_files(pod_url)
   end
 end
 

data/lib/ubalo.rb

@@ -4,6 +4,10 @@ require 'json'
 require 'open3'
 require 'pp'
 
+require 'zlib'
+require 'archive/tar/minitar'
+include Archive::Tar
+
 class String
   def lfit max_length
     if length - 3 <= max_length
@@ -69,6 +73,23 @@ class Ubalo
   end
 
   class << self
+    def tgz_filename
+      "ubalo-files.tar.gz"
+    end
+
+    def make_tgz file_list, tgz_name
+      tgz = Zlib::GzipWriter.new(File.open(tgz_name, 'wb'))
+      Minitar.pack(file_list, tgz)
+      tgz_name
+    end
+
+    def extract_tgz destination_dir, tgz_name
+      Dir.chdir(destination_dir) do
+        tgz = Zlib::GzipReader.new(File.open(tgz_name, 'rb'))
+        Minitar.unpack(tgz, '.')
+      end
+    end
+
     def print_content name, content
       data = content.fetch('data')
       content_type = content.fetch('content_type')
@@ -116,7 +137,6 @@ class Ubalo
         "#{pluralize((seconds/60/60/24).floor, "day")} ago"
       end
     end
-
   end
 
   attr_reader :base_url
@@ -132,14 +152,15 @@ class Ubalo
   end
 
   def raw_request(method, url, params)
+    resource = RestClient::Resource.new url, timeout: 60
     if method == :get
-      RestClient.get url, add_headers(:params => params, :accept => :json)
+      resource.get add_headers(:params => params, :accept => :json)
     elsif method == :post
-      RestClient.post url, params, add_headers(:accept => :json)
+      resource.post params, add_headers(:accept => :json)
     elsif method == :put
-      RestClient.put url, params, add_headers(:accept => :json)
+      resource.put params, add_headers(:accept => :json)
     elsif method == :delete
-      RestClient.delete url, add_headers(:accept => :json)
+      resource.delete add_headers(:accept => :json)
     else
       raise "don't understand request method #{method.inspect}"
     end
@@ -158,11 +179,11 @@ class Ubalo
   end
 
   def put(url, params={})
-    request(:put, url, params)
+    raw_request(:put, url, params)
   end
 
   def delete(url)
-    request(:delete, url, {})
+    raw_request(:delete, url, {})
   end
 
   def whoami
@@ -183,7 +204,7 @@ class Ubalo
   end
 
   def wait_task(label, silent=false)
-    60.times do
+    600.times do
       h = check_task(label)
       if h['state'] == 'exited'
         unless silent
@@ -201,7 +222,7 @@ class Ubalo
     raise "timed-out waiting for task #{label}"
   end
 
-  def download(pod_name)
+  def clone(pod_name)
     get("#{base_url}/pods/#{pod_name}")
   rescue RestClient::ResourceNotFound
     raise UbaloMessage, "could not find #{pod_name}"
@@ -243,20 +264,65 @@ class Ubalo
     post("#{base_url}/user/authorization", :user => {:login => login, :password => password})
   end
 
-  def available_templates
-    get("#{base_url}/templates")
+  def create_or_update pod_url, params={}
+    put(pod_url, :pod => params)
   end
 
-  def create_pod name, template
-    post("#{base_url}/templates/#{template}/pods", :pod => {:name => name})
+  def check_task label
+    get("#{base_url}/tasks/#{label}")
   end
 
-  def push pod_url, files
-    raw_request(:put, "#{pod_url}", :pod => {:files => files})
+  def upload_tgz pod_url, tgz_name
+    # Create the new archive in rails.
+    response = post("#{pod_url}/archives")
+    label = response.fetch('label')
+    put_url = response.fetch('put_url')
+    archive_location = response.fetch('url')
+
+    print "Uploading files... "
+    RestClient.put put_url, File.open(tgz_name, 'rb'), content_type: 'application/x-tar', content_encoding: 'x-gzip'
+    put("#{archive_location}/activate")
+
+    puts "done."
   end
 
-  def check_task label
-    get("#{base_url}/tasks/#{label}")
+  def push_files(pod_url)
+    ignore_filename = ".ubaloignore"
+    if File.exist?(ignore_filename)
+      ignore_patterns = File.read(ignore_filename).each_line.map(&:strip)
+    else
+      ignore_patterns = []
+    end
+
+    ignore_patterns += %w{. .. .ubalo ubalo-files.tar.gz}
+
+    filenames = []
+    Dir.glob('{.**,**}').each do |path|
+      next if ignore_patterns.any?{|pattern| File.fnmatch?(pattern, path, File::FNM_DOTMATCH)}
+
+      filenames << path
+    end
+
+    begin
+      Ubalo.make_tgz(filenames, Ubalo.tgz_filename)
+      upload_tgz(pod_url, Ubalo.tgz_filename)
+    ensure
+      FileUtils.rm_f(Ubalo.tgz_filename)
+    end
+  end
+
+  def retrieve_files(destination_path, files_url)
+    # First retrieve the S3 URL.
+    RestClient.get(files_url) do |response|
+      if response.code == 200
+        File.open(File.join(destination_path, Ubalo.tgz_filename), "wb") do |f|
+          f.write response
+        end
+        Ubalo.extract_tgz(destination_path, Ubalo.tgz_filename)
+      else
+        raise UbaloMessage, "failed to download pod files"
+      end
+    end
   end
 
   def publish pod_name

data/lib/ubalo/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ubalo
 version: !ruby/object:Gem::Version
-  version: 0.0.27
+  version: 0.0.28
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-23 00:00:00.000000000 Z
+date: 2012-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &70147294336420 !ruby/object:Gem::Requirement
+  requirement: &70105707914620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70147294336420
+  version_requirements: *70105707914620
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70147294335260 !ruby/object:Gem::Requirement
+  requirement: &70105707914160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70147294335260
+  version_requirements: *70105707914160
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70147294334080 !ruby/object:Gem::Requirement
+  requirement: &70105707827700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70147294334080
+  version_requirements: *70105707827700
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70147294327800 !ruby/object:Gem::Requirement
+  requirement: &70105707826560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,18 @@ dependencies:
         version: 1.6.3
   type: :runtime
   prerelease: false
-  version_requirements: *70147294327800
+  version_requirements: *70105707826560
+- !ruby/object:Gem::Dependency
+  name: archive-tar-minitar
+  requirement: &70105707825660 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70105707825660
 description: CLI and API client for Ubalo
 email: dev@ubalo.com
 executables: