vmc_knife 0.0.2 → 0.0.3

data/lib/vmc_knife/cli_extensions.rb

@@ -128,8 +128,16 @@ class VMC::Cli::KnifeRunner < VMC::Cli::Runner
       else
         set_cmd(:knifeapps, :restart_applications, @args.size) # too many
       end
+    when 'delete-all'
+      usage('vmc_knife delete-all [<applications_regexp>]')
+      @args.shift # consumes the argument.
+      if @args.size <= 2
+        set_cmd(:knifeapps, :delete_all, @args.size)
+      else
+        set_cmd(:knifeapps, :delete_all, @args.size) # too many
+      end
     when 'help'
-      display "vmc_knife expand-manifest|login|start/stop/restart-applications|upload-applications|configure|configure-recipes|configure-applications|configure-services|configure-vcap|configure-vcap-mdns|configure-vcap-etc-hosts [<manifest_path>]"
+      display "vmc_knife expand-manifest|login|start/stop/restart-applications|upload-applications|configure-all|configure-recipes|configure-applications|configure-services|delete-all|configure-vcap|configure-vcap-mdns|configure-vcap-etc-hosts [<manifest_path>]"
     else
       super
     end

data/lib/vmc_knife/commands/knife_cmds.rb

@@ -49,8 +49,29 @@ module VMC::Cli::Command
       __update(manifest_file_path_or_uri,cloud_controller_yml,VMC::KNIFE::VCAPUpdateCloudControllerConfig,"cloud_controller")
     end
     # updates /etc/hosts
-    def configure_etc_hosts(etc_hosts=nil,manifest_file_path_or_uri=nil)
-      __update(manifest_file_path_or_uri,etc_hosts,VMC::KNIFE::VCAPUpdateEtcHosts,"/etc/hosts")
+    def configure_etc_hosts(etc_hosts=nil,manifest_file_path=nil,client=nil)
+      #__update(manifest_file_path_or_uri,etc_hosts,VMC::KNIFE::VCAPUpdateEtcHosts,"/etc/hosts")
+      
+      # this will configure /etc/hosts with the urls of your applications as well as the cloudcontroller.
+      # it is not be necessary if avahi is correctly configured on your VM.
+      unless manifest_file_path.nil?
+        if File.exists? manifest_file_path
+          man = load_manifest(manifest_file_path)
+          uri = man['target']
+        else
+          uri = manifest_file_path
+        end
+      else
+        man = load_manifest(nil)
+        uri = man['target']
+      end
+      update_aliases = VMC::KNIFE::VCAPUpdateAvahiAliases.new(nil,man,client)
+      update_hosts = VMC::KNIFE::VCAPUpdateEtcHosts.new(uri,manifest_file_path,client)
+      update_hosts.set_all_uris(update_aliases.all_uris)
+      if update_hosts.update_pending()
+        display "Configuring /etc/hosts with uri: #{uri}" if VMC::Cli::Config.trace
+        update_hosts.execute()
+      end
     end
     # updates /etc/avahi/aliases
     def configure_etc_avahi_aliases(etc_avahi_aliases=nil,manifest_file_path=nil)
@@ -61,20 +82,27 @@ module VMC::Cli::Command
     end
     
     def configure_all(manifest_file_path_or_uri=nil)
-      display "Stop applications ..."
-      VMC::Cli::Command::Knifeapps.new(@options).stop_applications(nil,manifest_file_path_or_uri)
+      begin
+        display "Stop applications ..."
+        VMC::Cli::Command::Knifeapps.new(@options).stop_applications(nil,manifest_file_path_or_uri)
+      rescue
+        #nevermind. sometimes a wrong config we can't login and we can't stop the apps.
+      end
       display "Configure_cloud_controller ..."
-      configure_cloud_controller(nil,manifest_file_path_or_uri)
+      change = configure_cloud_controller(nil,manifest_file_path_or_uri)
       display "Configure_etc_hosts ..."
       configure_etc_hosts(nil,manifest_file_path_or_uri)
       display "Login again ..."
-      VMC::Cli::Command::Knifemisc.new(@options).login(manifest_file_path_or_uri)
+      new_knife = VMC::Cli::Command::Knifemisc.new(@options)
+      new_knife.login(manifest_file_path_or_uri)
+      # set the new client object to the old command.
+      @client = new_knife.client
       display "Configure_applications ..."
       VMC::Cli::Command::Knifeapps.new(@options).configure_applications(nil,manifest_file_path_or_uri)
       display "Configure_etc_avahi_aliases ..."
       configure_etc_avahi_aliases(nil,manifest_file_path_or_uri)
       display "Start applications ..."
-      VMC::Cli::Command::Knifeapps.new(@options).start_applications(nil,manifest_file_path_or_uri)
+      VMC::Cli::Command::Knifeapps.new(@options).restart_applications(nil,manifest_file_path_or_uri)
     end
 
     private
@@ -95,6 +123,9 @@ module VMC::Cli::Command
       if update_cc.update_pending()
         display "Configuring #{msg_label} with uri: #{uri}" if VMC::Cli::Config.trace
         update_cc.execute()
+        true
+      else
+        false
       end
     end
 
@@ -108,6 +139,7 @@ module VMC::Cli::Command
       man  = load_manifest(manifest_file_path)
       target_url = man['target']
       raise "No target defined in the manifest #{@manifest_path}" if target_url.nil? 
+      puts "set_target #{target_url}"
       set_target(target_url)
       
       email = man['email']
@@ -117,6 +149,8 @@ module VMC::Cli::Command
       
       tries ||= 0
       # login_and_save_token:
+      
+      puts "login with #{email} #{password}"
       token = client.login(email, password)
       VMC::Cli::Config.store_token(token)
       
@@ -173,6 +207,9 @@ module VMC::Cli::Command
     def restart_applications(app_names_regexp=nil,manifest_file_path=nil)
       recipe_configuror(:restart,nil,nil,app_names_regexp,manifest_file_path)
     end
+    def delete_all(app_names_regexp=nil,manifest_file_path=nil)
+      recipe_configuror(:delete,nil,nil,app_names_regexp,manifest_file_path)
+    end
     
     def recipe_configuror(method_sym_name,recipes_regexp=nil,app_names_regexp=nil,service_names_regexp=nil,manifest_file_path=nil)
       man = load_manifest(manifest_file_path)

data/lib/vmc_knife/json_expander.rb

@@ -4,6 +4,47 @@ require 'json'
 module VMC
   module KNIFE
     module JSON_EXPANDER
+      
+      # Reads the ip of a given interface and the mask
+      # defaults on eth0 then on wlan0 and then whatever it can find that is not 127.0.0.1
+      def self.ip_auto(interface='eth0')
+        res=`ifconfig | sed -n '/#{interface}/{n;p;}' | grep 'inet addr:' | grep -v '127.0.0.1' | cut -d: -f2 | awk '{ print $1}' | head -1`
+        if interface == 'eth0' && (res.nil? || res.strip.empty?)
+          res = VcapUtilities.ip_auto "wlan0"
+          if res.strip.empty?
+            #nevermind fetch the first IP you can find that is not 127.0.0.1
+            res=`ifconfig | grep 'inet addr:' | grep -v '127.0.0.1' | cut -d: -f2 | awk '{ print $1}' | head -1`
+          end
+        end
+        res.strip! if res
+        unless res.empty?
+          # gets the Mask
+          line=`ifconfig | grep 'inet addr:#{res}' | awk '{ print $1}' | head -1`
+          puts "parsing ip and mask in line #{line}"
+          mask=`ifconfig | grep 'inet addr:#{res}' | grep -v '127.0.0.1' | cut -d: -f4 | awk '{ print $1}' | head -1`
+          mask.strip!
+          puts "got ip #{res} and mask #{mask}"
+          return [ res, mask ]
+        end
+      end
+    
+      # Derive a seed guaranteed unique on the local network  according to the IP.
+      def self.ip_seed()
+        ip_mask=ip_auto()
+        ip = ip_mask[0]
+        mask = ip_mask[1]
+        ip_segs = ip.split('.')
+        if mask == "255.255.255.0"
+          ip_segs[3]
+        elsif mask == "255.255.0.0"
+          "#{ip_segs[2]}-#{ip_segs[3]}"
+        elsif mask == "255.0.0.0"
+          "#{ip_segs[1]}-#{ip_segs[2]}-#{ip_segs[3]}"
+        else
+          #hum why are we here?
+          "#{ip_segs[0]}-#{ip_segs[1]}-#{ip_segs[2]}-#{ip_segs[3]}"
+        end
+      end
     
       # Loads a json file.
       # Makes up to 10 passes evaluating ruby in the values that contain #{}.
@@ -20,6 +61,7 @@ module VMC
         puts data.to_json unless passes < 100
         raise "More than 100 passes evaluating the ruby template in the json file" unless passes < 100
         #puts "got data #{data.to_json}"
+        
         data
       end
       

data/lib/vmc_knife/vmc_helper.rb

@@ -0,0 +1,115 @@
+require 'json'
+module VMC
+  module KNIFE
+    module HELPER
+    
+  def self.static_upload_app_bits(client,appname, path)
+      display "Uploading Application #{appname} from #{path}:"
+
+      upload_file, file = "#{Dir.tmpdir}/#{appname}.zip", nil
+      FileUtils.rm_f(upload_file)
+
+      explode_dir = "#{Dir.tmpdir}/.vmc_#{appname}_files"
+      FileUtils.rm_rf(explode_dir) # Make sure we didn't have anything left over..
+
+      Dir.chdir(path) do
+        # Stage the app appropriately and do the appropriate fingerprinting, etc.
+        if war_file = Dir.glob('*.war').first
+puts "Exploding the war"
+          VMC::Cli::ZipUtil.unpack(war_file, explode_dir)
+puts "Done Exploding the war"
+        else
+puts "Copying the files"
+          FileUtils.mkdir(explode_dir)
+          files = Dir.glob('{*,.[^\.]*}')
+          # Do not process .git files
+          files.delete('.git') if files
+          FileUtils.cp_r(files, explode_dir)
+puts "Done copying the files"
+        end
+
+        # Send the resource list to the cloudcontroller, the response will tell us what it already has..
+###        unless @options[:noresources]
+          display '  Checking for available resources: ', false
+          fingerprints = []
+          total_size = 0
+puts "About to compute the fingerprints"
+          resource_files = Dir.glob("#{explode_dir}/**/*", File::FNM_DOTMATCH)
+          resource_files.each do |filename|
+            next if (File.directory?(filename) || !File.exists?(filename))
+            fingerprints << {
+              :size => File.size(filename),
+              :sha1 => Digest::SHA1.file(filename).hexdigest,
+              :fn => filename
+            }
+            total_size += File.size(filename)
+          end
+puts "Finished computing the fingerprints"
+          # Check to see if the resource check is worth the round trip
+          if (total_size > (64*1024)) # 64k for now
+            # Send resource fingerprints to the cloud controller
+puts "Invoking check_resources with the fingerprints"
+            appcloud_resources = client.check_resources(fingerprints)
+          end
+          display 'OK'.green
+
+          if appcloud_resources
+            display '  Processing resources: ', false
+            # We can then delete what we do not need to send.
+            appcloud_resources.each do |resource|
+              FileUtils.rm_f resource[:fn]
+              # adjust filenames sans the explode_dir prefix
+              resource[:fn].sub!("#{explode_dir}/", '')
+            end
+            display 'OK'.green
+          end
+
+###        end
+
+        # Perform Packing of the upload bits here.
+        unless VMC::Cli::ZipUtil.get_files_to_pack(explode_dir).empty?
+          display '  Packing application: ', false
+          VMC::Cli::ZipUtil.pack(explode_dir, upload_file)
+          display 'OK'.green
+
+          upload_size = File.size(upload_file);
+          if upload_size > 1024*1024
+            upload_size  = (upload_size/(1024.0*1024.0)).round.to_s + 'M'
+          elsif upload_size > 0
+            upload_size  = (upload_size/1024.0).round.to_s + 'K'
+          end
+        else
+          upload_size = '0K'
+        end
+
+        upload_str = "  Uploading (#{upload_size}): "
+        display upload_str, false
+
+        unless VMC::Cli::ZipUtil.get_files_to_pack(explode_dir).empty?
+          VMC::Cli::Command::FileWithPercentOutput.display_str = upload_str
+          VMC::Cli::Command::FileWithPercentOutput.upload_size = File.size(upload_file);
+          file = VMC::Cli::Command::FileWithPercentOutput.open(upload_file, 'rb')
+        end
+puts "client.upload_app about to start"
+        retries = 5
+        begin
+          client.upload_app(appname, file, appcloud_resources)
+        rescue Exception => e
+          retry if (retries -= 1) > 0
+        end
+puts "Done client.upload_app"
+        display 'OK'.green if VMC::Cli::ZipUtil.get_files_to_pack(explode_dir).empty?
+
+        display 'Push Status: ', false
+        display 'OK'.green
+      end
+
+    ensure
+      # Cleanup if we created an exploded directory.
+      FileUtils.rm_f(upload_file) if upload_file
+      FileUtils.rm_rf(explode_dir) if explode_dir
+    end
+    
+    end # end of HELPER
+  end # end of KNIFE
+end

data/lib/vmc_knife/vmc_knife.rb

@@ -253,6 +253,16 @@ module VMC
           application_updater.upload
         end
       end
+      def delete()
+        @applications.each do |application|
+          application_updater = ApplicationManifestApplier.new application, @client
+          application_updater.delete
+        end
+        @data_services.each do |data_service|
+          data_service_updater = DataServiceManifestApplier.new data_service, @client, @current_services, @current_services_info
+          data_service_updater.delete
+        end
+      end
       def restart()
         stop()
         start()
@@ -323,6 +333,11 @@ module VMC
         puts "Calling client.create_service #{@data_service_json['vendor']}, #{@data_service_json['name']}"
         client.create_service @data_service_json['vendor'], @data_service_json['name']
       end
+      def delete()
+        raise "The service #{@data_service_json['name']} does not exist." if current().empty?
+        client.delete_service(@data_service_json['name'])
+      end
+
       # Returns the service manifest for the vendor.
       # If the service vendor ( = type) is not provided by this vcap install
       # An exception is raised.
@@ -414,7 +429,13 @@ module VMC
               #empty directory.
               `wget --output-document=_download_.zip #{url}`
               raise "Unable to download #{url}" unless $? == 0
-              `unzip _download_.zip`
+              if /\.tgz$/ =~ url || /\.tar\.gz$/ =~ url
+                `tar zxvf _download_.zip`
+              elsif /\.tar$/ =~ url
+                `tar xvf _download_.zip`
+              else
+                `unzip _download_.zip`
+              end
               `rm _download_.zip`
             end
             VMC::KNIFE::HELPER.static_upload_app_bits(@client,@application_json['name'],Dir.pwd)
@@ -436,6 +457,11 @@ module VMC
         client.update_app(@application_json['name'], current())
       end
       
+      def delete()
+        raise "The application #{@application_json['name']} does not exist yet" if current().empty?
+        client.delete_app(@application_json['name'])
+      end
+
       # Generate the updated application manifest:
       # take the manifest defined in the saas recipe
       # merge it with the current manifest of the application.
@@ -624,12 +650,18 @@ module VMC
     # This is really a server-side feature.
     # Replace the 127.0.0.1 localhost #{old_uri} with the new uri
     class VCAPUpdateEtcHosts
-      def initialize(uri, etc_hosts_path=nil)
+      def initialize(uri, etc_hosts_path=nil,man=nil)
         @config = etc_hosts_path
         @config ||="/etc/hosts"
         @uri = uri
         raise "The config file #{@config} does not exist." unless File.exists? @config
       end
+      def set_all_uris(uris_arr)
+        uris_arr.push @uri unless @uri.nil?
+        uris_arr.sort!
+        uris_arr.uniq!
+        @uri = uris_arr.join(' ')
+      end
       def update_pending()
         #could also use:
         found_it=`sed -n '/^127\.0\.0\.1[[:space:]]*localhost[[:space:]]*#{@uri}/p' #{@config}`

data/lib/vmc_knife.rb

@@ -16,8 +16,7 @@ end
 
 
 require "#{ROOT_REL}/vmc_knife/json_expander"
-require "#{ROOT_REL}/vmc_knife/json_diff"
+require "#{ROOT_REL}/vmc_knife/vmc_helper"
 require "#{ROOT_REL}/vmc_knife/vmc_knife"
 
 require "#{ROOT_REL}/vmc_knife/cli_extensions"
-

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vmc_knife
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Intalio Pte
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-29 00:00:00 Z
+date: 2011-11-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: vmc
@@ -106,9 +106,9 @@ files:
 - lib/restclient/restclient_add_timeout.rb
 - lib/vmc_knife/cli_extensions.rb
 - lib/vmc_knife/commands/knife_cmds.rb
-- lib/vmc_knife/json_diff.rb
 - lib/vmc_knife/json_expander.rb
 - lib/vmc_knife/version.rb
+- lib/vmc_knife/vmc_helper.rb
 - lib/vmc_knife/vmc_knife.rb
 - lib/vmc_knife.rb
 - bin/vmc_knife
@@ -141,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Extensions for VMC the CLI of VMWare's Cloud Foundry

data/lib/vmc_knife/json_diff.rb

@@ -1,83 +0,0 @@
-require 'json'
-module VMC
-  module KNIFE
-    module JSON_DIFF
-    
-    DIFF_NODE_NAME = "__diff__"
-    TYPE_NODE_NAME = "__type__"
-    PLUS="+"
-    MINUS="-"
-    CHANGED="=>"
-    DISPLAY_TYPE_ONLY_WHEN_CHANGE=true
-    
-    def self.compare(a,b,pretty=true)
-      if a.kind_of?(String) && b.kind_of?(String) && File.exists?(a) && File.exists?(b)
-        a = JSON.parse File.open(a).read
-        b = JSON.parse File.open(b).read
-      end
-      if pretty
-        JSON.pretty_generate compare_tree(a, b)
-      else
-        compare_tree(a, b).to_json
-      end
-    end
-    
-    def self.compare_tree(a, b)
-      typeA = a.class.name
-      typeB = b.class.name
-      
-      aString = a.to_s unless is_array_or_hash?(a)
-      bString = b.to_s unless is_array_or_hash?(b)
-            
-      node = Hash.new
-      if a.nil?
-        node[DIFF_NODE_NAME]=PLUS
-        node[TYPE_NODE_NAME]=typeB unless DISPLAY_TYPE_ONLY_WHEN_CHANGE
-        node['value']=bString if bString
-      elsif b.nil?
-        node[DIFF_NODE_NAME]=MINUS
-        node[TYPE_NODE_NAME]=typeA unless DISPLAY_TYPE_ONLY_WHEN_CHANGE
-        node['value']=aString if aString
-      elsif (typeA != typeB) || (!aString.nil? && a != b)
-        node[DIFF_NODE_NAME]=CHANGED
-        if typeA != typeB
-          node[TYPE_NODE_NAME]="#{typeA} => #{typeB}"
-        else
-          node[TYPE_NODE_NAME]=typeA unless DISPLAY_TYPE_ONLY_WHEN_CHANGE
-        end
-        node['value']="#{aString} => #{bString}" if aString
-      else
-        node[TYPE_NODE_NAME]=typeA unless DISPLAY_TYPE_ONLY_WHEN_CHANGE
-        node['value']=aString if aString
-      end
-      
-      if aString
-        return node
-      end
-      child_node=node
-#      child_node = Hash.new
-#      node['child']=child_node
-      keys = Array.new
-      keys = collect_keys(a,keys)
-      keys = collect_keys(b,keys)
-      keys.sort!
-      for i in 0..(keys.length-1)
-        if (keys[i] != keys[i-1])
-          value = compare_tree(a && a[keys[i]], b && b[keys[i]]);
-          child_node[keys[i]]=value
-        end
-      end
-      node
-    end
-    private
-    def self.is_array_or_hash?(obj)
-      obj.kind_of?(Array) || obj.kind_of?(Hash)
-    end
-    def self.collect_keys(obj, collector)
-      return Array.new unless obj.kind_of? Hash
-      collector + obj.keys
-    end
-    
-    end # end of JSON_DIFF
-  end # end of KNIFE
-end