cfoundry 0.3.19 → 0.3.20

data/lib/cfoundry/upload_helpers.rb

@@ -0,0 +1,100 @@
+require "fileutils"
+require "pathname"
+require "digest/sha1"
+
+module CFoundry
+  module UploadHelpers
+    # Default paths to exclude from upload payload.
+    UPLOAD_EXCLUDE = %w{.git _darcs .svn}
+
+    def make_fingerprints(path)
+      fingerprints = []
+      total_size = 0
+
+      Dir.glob("#{path}/**/*", File::FNM_DOTMATCH) do |filename|
+        next if File.directory?(filename)
+
+        size = File.size(filename)
+
+        total_size += size
+
+        fingerprints << {
+          :size => size,
+          :sha1 => Digest::SHA1.file(filename).hexdigest,
+          :fn => filename
+        }
+      end
+
+      [fingerprints, total_size]
+    end
+
+    def prepare_package(path, to)
+      if path =~ /\.(jar|war|zip)$/
+        CFoundry::Zip.unpack(path, to)
+      elsif war_file = Dir.glob("#{path}/*.war").first
+        CFoundry::Zip.unpack(war_file, to)
+      else
+        check_unreachable_links(path)
+
+        FileUtils.mkdir(to)
+
+        files = Dir.glob("#{path}/{*,.[^\.]*}")
+
+        exclude = UPLOAD_EXCLUDE
+        if File.exists?("#{path}/.vmcignore")
+          exclude += File.read("#{path}/.vmcignore").split(/\n+/)
+        end
+
+        # prevent initial copying if we can, remove sub-files later
+        files.reject! do |f|
+          exclude.any? do |e|
+            File.fnmatch(f.sub(path + "/", ""), e)
+          end
+        end
+
+        FileUtils.cp_r(files, to)
+
+        find_sockets(to).each do |s|
+          File.delete s
+        end
+
+        # remove ignored globs more thoroughly
+        #
+        # note that the above file list only includes toplevel
+        # files/directories for cp_r, so this is where sub-files/etc. are
+        # removed
+        exclude.each do |e|
+          Dir.glob("#{to}/#{e}").each do |f|
+            FileUtils.rm_rf(f)
+          end
+        end
+      end
+    end
+
+    def check_unreachable_links(path)
+      files = Dir.glob("#{path}/**/*", File::FNM_DOTMATCH)
+
+      # only used for friendlier error message
+      pwd = Pathname.pwd
+
+      abspath = File.expand_path(path)
+      unreachable = []
+      files.each do |f|
+        file = Pathname.new(f)
+        if file.symlink? && !file.realpath.to_s.start_with?(abspath)
+          unreachable << file.relative_path_from(pwd)
+        end
+      end
+
+      unless unreachable.empty?
+        root = Pathname.new(path).relative_path_from(pwd)
+        raise "Can't deploy application containing links '#{unreachable}' that reach outside its root '#{root}'"
+      end
+    end
+
+    def find_sockets(path)
+      files = Dir.glob("#{path}/**/*", File::FNM_DOTMATCH)
+      files && files.select { |f| File.socket? f }
+    end
+  end
+end

data/lib/cfoundry/v1/app.rb

@@ -1,9 +1,7 @@
-require "fileutils"
-require "digest/sha1"
-require "pathname"
 require "tmpdir"
 
 require "cfoundry/zip"
+require "cfoundry/upload_helpers"
 require "cfoundry/chatty_hash"
 
 require "cfoundry/v1/framework"
@@ -17,6 +15,8 @@ module CFoundry::V1
   # retrieval, as the attributes are all lazily retrieved. Setting attributes
   # does not perform any requests; use #update! to commit your changes.
   class App
+    include CFoundry::UploadHelpers
+
     # Application name.
     attr_accessor :name
 
@@ -323,9 +323,6 @@ module CFoundry::V1
       Instance.new(@name, 0, @client).file(*path)
     end
 
-    # Default paths to exclude from upload payload.
-    UPLOAD_EXCLUDE = %w{.git _darcs .svn}
-
     # Upload application's code to target. Do this after #create! and before
     # #start!
     #
@@ -443,69 +440,11 @@ module CFoundry::V1
       }
     end
 
-    def prepare_package(path, to)
-      if path =~ /\.(jar|war|zip)$/
-        CFoundry::Zip.unpack(path, to)
-      elsif war_file = Dir.glob("#{path}/*.war").first
-        CFoundry::Zip.unpack(war_file, to)
-      else
-        check_unreachable_links(path)
-
-        FileUtils.mkdir(to)
-
-        files = Dir.glob("#{path}/{*,.[^\.]*}")
-
-        exclude = UPLOAD_EXCLUDE
-        if File.exists?("#{path}/.vmcignore")
-          exclude += File.read("#{path}/.vmcignore").split(/\n+/)
-        end
-
-        # prevent initial copying if we can, remove sub-files later
-        files.reject! do |f|
-          exclude.any? do |e|
-            File.fnmatch(f.sub(path + "/", ""), e)
-          end
-        end
-
-        FileUtils.cp_r(files, to)
-
-        find_sockets(to).each do |s|
-          File.delete s
-        end
-
-        # remove ignored globs more thoroughly
-        #
-        # note that the above file list only includes toplevel
-        # files/directories for cp_r, so this is where sub-files/etc. are
-        # removed
-        exclude.each do |e|
-          Dir.glob("#{to}/#{e}").each do |f|
-            FileUtils.rm_rf(f)
-          end
-        end
-      end
-    end
-
     # Minimum size for an application payload to bother checking resources.
     RESOURCE_CHECK_LIMIT = 64 * 1024
 
     def determine_resources(path)
-      fingerprints = []
-      total_size = 0
-
-      Dir.glob("#{path}/**/*", File::FNM_DOTMATCH) do |filename|
-        next if File.directory?(filename)
-
-        size = File.size(filename)
-
-        total_size += size
-
-        fingerprints << {
-          :size => size,
-          :sha1 => Digest::SHA1.file(filename).hexdigest,
-          :fn => filename
-        }
-      end
+      fingerprints, total_size = make_fingerprints(path)
 
       return if total_size <= RESOURCE_CHECK_LIMIT
 
@@ -519,32 +458,6 @@ module CFoundry::V1
       resources
     end
 
-    def check_unreachable_links(path)
-      files = Dir.glob("#{path}/**/*", File::FNM_DOTMATCH)
-
-      # only used for friendlier error message
-      pwd = Pathname.pwd
-
-      abspath = File.expand_path(path)
-      unreachable = []
-      files.each do |f|
-        file = Pathname.new(f)
-        if file.symlink? && !file.realpath.to_s.start_with?(abspath)
-          unreachable << file.relative_path_from(pwd)
-        end
-      end
-
-      unless unreachable.empty?
-        root = Pathname.new(path).relative_path_from(pwd)
-        raise "Can't deploy application containing links '#{unreachable}' that reach outside its root '#{root}'"
-      end
-    end
-
-    def find_sockets(path)
-      files = Dir.glob("#{path}/**/*", File::FNM_DOTMATCH)
-      files && files.select { |f| File.socket? f }
-    end
-
     # Class represnting a running instance of an application.
     class Instance
       # The application this instance belongs to.

data/lib/cfoundry/v2/app.rb

@@ -1,10 +1,8 @@
-require "fileutils"
-require "digest/sha1"
-require "pathname"
 require "tmpdir"
 require "json"
 
 require "cfoundry/zip"
+require "cfoundry/upload_helpers"
 require "cfoundry/chatty_hash"
 
 require "cfoundry/v2/model"
@@ -17,6 +15,8 @@ module CFoundry::V2
   # retrieval, as the attributes are all lazily retrieved. Setting attributes
   # does not perform any requests; use #update! to commit your changes.
   class App < Model
+    include CFoundry::UploadHelpers
+
     attribute :name
     attribute :production
     to_one    :space
@@ -154,5 +154,63 @@ module CFoundry::V2
         b.service_instance == instance
       }
     end
+
+    # Upload application's code to target. Do this after #create! and before
+    # #start!
+    #
+    # [path]
+    #   A path pointing to either a directory, or a .jar, .war, or .zip
+    #   file.
+    #
+    #   If a .vmcignore file is detected under the given path, it will be used
+    #   to exclude paths from the payload, similar to a .gitignore.
+    #
+    # [check_resources]
+    #   If set to `false`, the entire payload will be uploaded
+    #   without checking the resource cache.
+    #
+    #   Only do this if you know what you're doing.
+    def upload(path, check_resources = true)
+      unless File.exist? path
+        raise "invalid application path '#{path}'"
+      end
+
+      zipfile = "#{Dir.tmpdir}/#{@guid}.zip"
+      tmpdir = "#{Dir.tmpdir}/.vmc_#{@guid}_files"
+
+      FileUtils.rm_f(zipfile)
+      FileUtils.rm_rf(tmpdir)
+
+      prepare_package(path, tmpdir)
+
+      resources = determine_resources(tmpdir) if check_resources
+
+      packed = CFoundry::Zip.pack(tmpdir, zipfile)
+
+      @client.base.upload_app(@guid, packed && zipfile, resources || [])
+    ensure
+      FileUtils.rm_f(zipfile) if zipfile
+      FileUtils.rm_rf(tmpdir) if tmpdir
+    end
+
+    private
+
+    # Minimum size for an application payload to bother checking resources.
+    RESOURCE_CHECK_LIMIT = 64 * 1024
+
+    def determine_resources(path)
+      fingerprints, total_size = make_fingerprints(path)
+
+      return if total_size <= RESOURCE_CHECK_LIMIT
+
+      resources = @client.base.resource_match(fingerprints)
+
+      resources.each do |resource|
+        FileUtils.rm_f resource[:fn]
+        resource[:fn].sub!("#{path}/", "")
+      end
+
+      resources
+    end
   end
 end

data/lib/cfoundry/v2/base.rb

@@ -78,6 +78,27 @@ module CFoundry::V2
       end
     end
 
+    def resource_match(fingerprints)
+      post(fingerprints, "v2", "resource_match", :json => :json)
+    end
+
+    def upload_app(guid, zipfile, resources = [])
+      payload = {
+        :resources => resources.to_json,
+        :multipart => true,
+        :application =>
+          if zipfile.is_a? File
+            zipfile
+          elsif zipfile.is_a? String
+            File.new(zipfile, "rb")
+          end
+      }
+
+      put(payload, "v2", "apps", guid, "bits")
+    rescue RestClient::ServerBrokeConnection
+      retry
+    end
+
 
     def params_from(args)
       depth, query = args

data/lib/cfoundry/v2/model.rb

@@ -172,11 +172,11 @@ module CFoundry::V2
     end
 
     def update!(diff = @diff)
-      @client.base.send(:"update_#{object_name}", @guid, diff)
+      @manifest = @client.base.send(:"update_#{object_name}", @guid, diff)
 
       @diff.clear if diff == @diff
 
-      @manifest = nil
+      true
     end
 
     def delete!

data/lib/cfoundry/version.rb

@@ -1,4 +1,4 @@
 module CFoundry # :nodoc:
   # CFoundry library version number.
-  VERSION = "0.3.19"
+  VERSION = "0.3.20"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cfoundry
 version: !ruby/object:Gem::Version 
-  hash: 53
+  hash: 59
   prerelease: 
   segments: 
   - 0
   - 3
-  - 19
-  version: 0.3.19
+  - 20
+  version: 0.3.20
 platform: ruby
 authors: 
 - Alex Suraci
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-06 00:00:00 Z
+date: 2012-08-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rest-client
@@ -110,6 +110,7 @@ files:
 - lib/cfoundry/client.rb
 - lib/cfoundry/errors.rb
 - lib/cfoundry/uaaclient.rb
+- lib/cfoundry/upload_helpers.rb
 - lib/cfoundry/v1/app.rb
 - lib/cfoundry/v1/base.rb
 - lib/cfoundry/v1/client.rb
@@ -168,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: cfoundry
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: High-level library for working with the Cloud Foundry API.