vmc 0.4.0.beta.2 → 0.4.0.beta.3

data/vmc-ng/lib/vmc/cli/app.rb

@@ -5,33 +5,69 @@ module VMC
   class App < Command
     MEM_CHOICES = ["64M", "128M", "256M", "512M"]
 
+    # TODO: don't hardcode; bring in from remote
+    MEM_DEFAULTS_FRAMEWORK = {
+      "rails3" => "256M",
+      "spring" => "512M",
+      "grails" => "512M",
+      "lift" => "512M",
+      "java_web" => "512M",
+      "standalone" => "64M",
+      "sinatra" => "128M",
+      "node" => "64M",
+      "php" => "128M",
+      "otp_rebar" => "64M",
+      "wsgi" => "64M",
+      "django" => "128M",
+      "dotNet" => "128M",
+      "rack" => "128M",
+      "play" => "256M"
+    }
+
+    MEM_DEFAULTS_RUNTIME = {
+      "java7" => "512M",
+      "java" => "512M",
+      "php" => "128M",
+      "ruby" => "128M",
+      "ruby19" => "128M"
+    }
+
+
     desc "push [NAME]", "Push an application, syncing changes if it exists"
     group :apps, :manage
     flag(:name) { ask("Name") }
-    flag(:path) {
-      ask("Push from...", :default => ".")
-    }
+    flag(:path, :default => ".")
     flag(:url) { |name, target|
       ask("URL", :default => "#{name}.#{target}")
     }
-    flag(:memory) {
+    flag(:memory) { |framework, runtime|
       ask("Memory Limit",
           :choices => MEM_CHOICES,
-
-          # TODO: base this on framework choice
-          :default => "64M")
+          :default =>
+            MEM_DEFAULTS_RUNTIME[runtime] ||
+              MEM_DEFAULTS_FRAMEWORK[framework] ||
+              "64M")
     }
     flag(:instances) {
       ask("Instances", :default => 1)
     }
     flag(:framework) { |choices, default|
-      ask("Framework", :choices => choices, :default => default)
+      opts = {:choices => choices}
+      opts[:default] = default if default
+
+      ask("Framework", :choices => choices)
     }
     flag(:runtime) { |choices|
       ask("Runtime", :choices => choices)
     }
     flag(:start, :default => true)
     flag(:restart, :default => true)
+    flag(:create_services, :type => :boolean) {
+      ask "Create services for application?", :default => false
+    }
+    flag(:bind_services, :type => :boolean) {
+      ask "Bind other services to application?", :default => false
+    }
     def push(name = nil)
       path = File.expand_path(input(:path))
 
@@ -54,10 +90,10 @@ module VMC
       domain = client.target.sub(/^https?:\/\/api\.(.+)\/?/, '\1')
       app.urls = [input(:url, name, domain)]
 
-      framework = input(:framework, ["other"] + detected.keys, default)
+      framework = input(:framework, ["other"] + detected.keys.sort, default)
       if framework == "other"
         forget(:framework)
-        framework = input(:framework, frameworks.keys)
+        framework = input(:framework, frameworks.keys.sort, nil)
       end
 
       framework_runtimes =
@@ -66,12 +102,64 @@ module VMC
         end
 
       # TODO: include descriptions
-      runtime = input(:runtime, framework_runtimes).split.first
+      runtime = input(:runtime, framework_runtimes.sort).split.first
 
       app.framework = framework
       app.runtime = runtime
 
-      app.memory = megabytes(input(:memory))
+      app.memory = megabytes(input(:memory, framework, runtime))
+
+      bindings = []
+      if input(:create_services) && !force?
+        services = client.system_services
+
+        while true
+          vendor = ask "What kind?", :choices => services.keys.sort
+          meta = services[vendor]
+
+          if meta[:versions].size == 1
+            version = meta[:versions].first
+          else
+            version = ask "Which version?",
+              :choices => meta[:versions].sort.reverse
+          end
+
+          random = sprintf("%x", rand(1000000))
+          service_name = ask "Service name?", :default => "#{vendor}-#{random}"
+
+          service = client.service(service_name)
+          service.type = meta[:type]
+          service.vendor = meta[:vendor]
+          service.version = version
+          service.tier = "free"
+
+          with_progress("Creating service #{c(service_name, :blue)}") do
+            service.create!
+          end
+
+          bindings << service_name
+
+          break unless ask "Create another service?", :default => false
+        end
+      end
+
+      if input(:bind_services) && !force?
+        services = client.services.collect(&:name)
+
+        while true
+          choices = services - bindings
+          break if choices.empty?
+
+          bindings << ask("Bind which service?", :choices => choices.sort)
+
+          unless bindings.size < services.size &&
+                  ask("Bind another service?", :default => false)
+            break
+          end
+        end
+      end
+
+      app.services = bindings
 
       with_progress("Creating #{c(name, :blue)}") do
         app.create!
@@ -189,7 +277,7 @@ module VMC
         apps = client.apps
         fail "No applications." if apps.empty?
 
-        names = [input(:name, apps.collect(&:name))]
+        names = [input(:name, apps.collect(&:name).sort)]
       end
 
       names.each do |name|

data/vmc-ng/lib/vmc/cli/command.rb

@@ -139,8 +139,10 @@ module VMC
 
     class_option :proxy, :aliases => "-u", :desc => "Proxy user"
 
-    class_option :verbose,
-      :type => :boolean, :aliases => "-v", :desc => "Verbose"
+    class_option :version,
+      :type => :boolean, :aliases => "-v", :desc => "Print version number"
+
+    class_option :verbose, :type => :boolean, :desc => "Verbose"
 
     class_option :force,
       :type => :boolean, :aliases => "-f", :desc => "Force (no interaction)"
@@ -359,6 +361,8 @@ module VMC
       raise
     rescue UserError => e
       err e.message
+    rescue CFoundry::Denied => e
+      err NotAuthorized.new.message
     rescue Exception => e
       msg = e.class.name
       msg << ": #{e}" unless e.to_s.empty?

data/vmc-ng/lib/vmc/cli/service.rb

@@ -4,47 +4,35 @@ module VMC
   class Service < Command
     desc "create", "Create a service"
     group :services, :manage
-    flag(:type) { |choices|
+    flag(:vendor) { |choices|
       ask "What kind?", :choices => choices
     }
+    flag(:version) { |choices|
+      ask "Which version?", :choices => choices
+    }
     flag(:name) { |vendor|
       random = sprintf("%x", rand(1000000))
       ask "Name?", :default => "#{vendor}-#{random}"
     }
     def create
-      choices = []
-      manifests = {}
-      client.system_services.each do |type, vendors|
-        vendors.each do |vendor, versions|
-          versions.each do |version, _|
-            choice = "#{vendor} #{version}"
-            manifests[choice] = {
-              :type => type,
-              :vendor => vendor,
-              :version => version
-            }
-
-            choices << choice
-          end
-        end
-      end
+      services = client.system_services
 
-      type = input(:type, choices)
-      meta = manifests[type]
+      vendor = input(:vendor, services.keys)
+      meta = services[vendor]
 
-      # --type redis should work, and just ignore version
-      unless meta
-        _, meta = manifests.find { |k, _| k.split.first == type }
-        fail "Unknown service type." unless meta
+      if meta[:versions].size == 1
+        version = meta[:versions].first
+      else
+        version = input(:version, meta[:versions])
       end
 
       service = client.service(input(:name, meta[:vendor]))
       service.type = meta[:type]
       service.vendor = meta[:vendor]
-      service.version = meta[:version]
+      service.version = version
       service.tier = "free"
 
-      with_progress("Creating service") do
+      with_progress("Creating service #{c(service.name, :blue)}") do
         service.create!
       end
     end
@@ -117,6 +105,8 @@ module VMC
       with_progress("Deleting #{c(name, :blue)}") do
         client.service(name).delete!
       end
+    ensure
+      forget(:really)
     end
   end
 end

data/vmc-ng/lib/vmc/cli/user.rb

@@ -16,9 +16,8 @@ module VMC
     def create(email = nil)
       email ||= input(:email)
       password = input(:password)
-      verify = input(:verify)
 
-      if password != verify
+      if !force? && password != input(:verify)
         fail "Passwords don't match."
       end
 

data/vmc-ng/lib/vmc/cli.rb

@@ -67,12 +67,7 @@ module VMC
       if input(:services)
         raise NotAuthorized unless authorized
 
-        services = {}
-        client.system_services.each do |_, svcs|
-          svcs.each do |name, versions|
-            services[name] = versions.values
-          end
-        end
+        services = client.system_services
 
         if simple_output?
           services.each do |name, _|
@@ -82,12 +77,12 @@ module VMC
           return
         end
 
-        services.each do |name, versions|
+        services.each do |name, meta|
           puts ""
           puts "#{c(name, :blue)}:"
-          puts "  versions: #{versions.collect { |v| v["version"] }.join ", "}"
-          puts "  description: #{versions[0]["description"]}"
-          puts "  type: #{versions[0]["type"]}"
+          puts "  versions: #{meta[:versions].join ", "}"
+          puts "  description: #{meta[:description]}"
+          puts "  type: #{meta[:type]}"
         end
 
         return
@@ -208,6 +203,9 @@ module VMC
     flag(:password) {
       ask("Password", :echo => "*", :forget => true)
     }
+    flag(:verify_password) {
+      ask("Confirm Password", :echo => "*", :forget => true)
+    }
     flag(:no_login, :type => :boolean)
     def register(email = nil)
       unless simple_output?
@@ -216,7 +214,11 @@ module VMC
       end
 
       email ||= input(:email)
-      password = input(:password)
+      password ||= input(:password)
+
+      if !force? && password != input(:verify_password)
+        fail "Passwords do not match."
+      end
 
       with_progress("Creating user") do
         client.register(email, password)
@@ -284,6 +286,11 @@ module VMC
     flag :all, :default => false
     group :start
     def help(task = nil)
+      if options[:version]
+        puts "vmc #{VERSION}"
+        return
+      end
+
       if task
         self.class.task_help(@shell, task)
       else

data/vmc-ng/lib/vmc/detect.rb

@@ -10,6 +10,25 @@ module VMC
       info["frameworks"] || {}
     end
 
+    def find_top(entries)
+      found = false
+
+      entries.each do |e|
+        is_toplevel =
+          e.ftype == :directory && e.name.index("/") + 1 == e.name.size
+
+        if is_toplevel && e.name !~ /^(\.|__MACOSX)/
+          if found
+            return false
+          else
+            found = e.name
+          end
+        end
+      end
+
+      found
+    end
+
     def frameworks
       info = @client.info
 
@@ -25,6 +44,14 @@ module VMC
             if File.file? @path
               if File.fnmatch(file, @path)
                 [@path]
+              elsif @path =~ /\.(zip|jar|war)/
+                lines = CFoundry::Zip.entry_lines(@path)
+                top = find_top(lines)
+
+                lines.collect(&:name).select do |path|
+                  File.fnmatch(file, path) ||
+                    top && File.fnmatch(top + file, path)
+                end
               else
                 []
               end

data/vmc-ng/lib/vmc/version.rb

@@ -1,3 +1,3 @@
 module VMC
-  VERSION = "0.1.5"
+  VERSION = "0.4.0.beta.3"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: vmc
 version: !ruby/object:Gem::Version 
-  hash: 62196455
+  hash: 62196453
   prerelease: 6
   segments: 
   - 0
   - 4
   - 0
   - beta
-  - 2
-  version: 0.4.0.beta.2
+  - 3
+  version: 0.4.0.beta.3
 platform: ruby
 authors: 
 - VMware
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-30 00:00:00 Z
+date: 2012-06-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json_pure
@@ -249,12 +249,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 23
         segments: 
         - 0
-        - 1
         - 2
-        version: 0.1.2
+        - 0
+        version: 0.2.0
   type: :runtime
   version_requirements: *id014
 - !ruby/object:Gem::Dependency