vmc-tsuru 0.1.alpha → 0.2.alpha

data/lib/cli/commands/apps.rb

@@ -24,9 +24,11 @@ module VMC::Cli::Command
       return display "No Applications" if apps.nil? || apps.empty?
 
       apps_table = table do |t|
-        t.headings = 'Application', '# ', 'Health', 'URLS', 'Services'
+        #t.headings = 'Application', '# ', 'Health', 'URLS', 'Services'
+        t.headings = 'Application', 'State'
         apps.each do |app|
-          t << [app[:name], app[:instances], health(app), app[:uris].join(', '), app[:services].join(', ')]
+          #t << [app[:name], app[:instances], health(app), app[:uris].join(', '), app[:services].join(', ')]
+          t << [app[:Name], app[:State]]
         end
       end
       display apps_table
@@ -756,37 +758,37 @@ module VMC::Cli::Command
 
     def delete_app(appname, force)
       app = client.app_info(appname)
-      services_to_delete = []
-      app_services = app[:services]
-      services_apps_hash = provisioned_services_apps_hash
-      app_services.each { |service|
-        del_service = force && no_prompt
-        unless no_prompt || force
-          del_service = ask(
-            "Provisioned service [#{service}] detected, would you like to delete it?",
-            :default => false
-          )
-
-          if del_service
-            apps_using_service = services_apps_hash[service].reject!{ |app| app == appname}
-            if apps_using_service.size > 0
-              del_service = ask(
-                "Provisioned service [#{service}] is also used by #{apps_using_service.size == 1 ? "app" : "apps"} #{apps_using_service.entries}, are you sure you want to delete it?",
-                :default => false
-              )
-            end
-          end
-        end
-        services_to_delete << service if del_service
-      }
+      #services_to_delete = []
+      #app_services = app[:services]
+      #services_apps_hash = provisioned_services_apps_hash
+      # app_services.each { |service|
+      #   del_service = force && no_prompt
+      #   unless no_prompt || force
+      #     del_service = ask(
+      #       "Provisioned service [#{service}] detected, would you like to delete it?",
+      #       :default => false
+      #     )
+
+      #     if del_service
+      #       apps_using_service = services_apps_hash[service].reject!{ |app| app == appname}
+      #       if apps_using_service.size > 0
+      #         del_service = ask(
+      #           "Provisioned service [#{service}] is also used by #{apps_using_service.size == 1 ? "app" : "apps"} #{apps_using_service.entries}, are you sure you want to delete it?",
+      #           :default => false
+      #         )
+      #       end
+      #     end
+      #   end
+      #   services_to_delete << service if del_service
+      # }
 
       display "Deleting application [#{appname}]: ", false
       client.delete_app(appname)
       display 'OK'.green
-
-      services_to_delete.each do |s|
-        delete_service_banner(s)
-      end
+# 
+#       services_to_delete.each do |s|
+#         delete_service_banner(s)
+#       end
     end
 
     def do_start(appname, push=false)

data/lib/cli/commands/services.rb

@@ -20,40 +20,43 @@ module VMC::Cli::Command
     end
 
     def create_service(service=nil, name=nil, appname=nil)
-      unless no_prompt || service
-        services = client.services_info
-        err 'No services available to provision' if services.empty?
-        service = ask(
-          "Which service would you like to provision?",
-          { :indexed => true,
-            :choices =>
-              services.values.collect { |type|
-                type.keys.collect(&:to_s)
-              }.flatten
-          }
-        )
-      end
+      # unless no_prompt || service
+      #   # services = client.services_info
+      #   err 'No services available to provision' if services.empty?
+      #   service = ask(
+      #     "Which service would you like to provision?",
+      #     { :indexed => true,
+      #       :choices =>
+      #         services.values.collect { |type|
+      #           type.keys.collect(&:to_s)
+      #         }.flatten
+      #     }
+      #   )
+      # end
+
       name = @options[:name] unless name
       unless name
         name = random_service_name(service)
         picked_name = true
       end
+
       create_service_banner(service, name, picked_name)
       appname = @options[:bind] unless appname
       bind_service_banner(name, appname) if appname
     end
 
     def delete_service(service=nil)
-      unless no_prompt || service
-        user_services = client.services
-        err 'No services available to delete' if user_services.empty?
-        service = ask(
-          "Which service would you like to delete?",
-          { :indexed => true,
-            :choices => user_services.collect { |s| s[:name] }
-          }
-        )
-      end
+      # unless no_prompt || service
+      #   user_services = client.services
+      #   err 'No services available to delete' if user_services.empty?
+      #   service = ask(
+      #     "Which service would you like to delete?",
+      #     { :indexed => true,
+      #       :choices => user_services.collect { |s| s[:name] }
+      #     }
+      #   )
+      # end
+
       err "Service name required." unless service
       display "Deleting service [#{service}]: ", false
       client.delete_service(service)

data/lib/cli/services_helper.rb

@@ -9,12 +9,8 @@ module VMC::Cli
       return display "No system services available" if services.empty?
 
       displayed_services = []
-      services.each do |service_type, value|
-        value.each do |vendor, version|
-          version.each do |version_str, service|
-            displayed_services << [ vendor, version_str, service[:description] ]
-          end
-        end
+      services.each do |service|
+        displayed_services << [service[:Charm], "-", service[:Name]]
       end
       displayed_services.sort! { |a, b| a.first.to_s <=> b.first.to_s}
 
@@ -36,7 +32,7 @@ module VMC::Cli
       services_table = table do |t|
         t.headings = 'Name', 'Service'
         services.each do |service|
-          t << [ service[:name], service[:vendor] ]
+          t << [ service[:Name], service[:Type][:Name] ]
         end
       end
       display services_table

data/lib/cli/version.rb

@@ -2,6 +2,6 @@ module VMC
   module Cli
     # This version number is used as the RubyGem release version.
     # The internal VMC version number is VMC::VERSION.
-    VERSION = '0.1.alpha'
+    VERSION = '0.2.alpha'
   end
 end

data/lib/vmc/client.rb

@@ -59,8 +59,9 @@ class VMC::Client
 
   # Global listing of services that are available on the target system
   def services_info
-    check_login_status
-    json_get(path(VMC::GLOBAL_SERVICES_PATH))
+    #check_login_status
+    #json_get(path(VMC::GLOBAL_SERVICES_PATH))
+    json_get("http://tsuru.plataformas.glb.com:4000/services/types")
   end
 
   def runtimes_info
@@ -73,7 +74,7 @@ class VMC::Client
 
   def apps
     #check_login_status
-    json_get(VMC::APPS_PATH)
+    json_get("http://tsuru.plataformas.glb.com:4000/apps")
   end
 
   def create_app(name, manifest={})
@@ -111,15 +112,17 @@ class VMC::Client
   end
 
   def delete_app(name)
-    check_login_status
-    http_delete(path(VMC::APPS_PATH, name))
+    #check_login_status
+    #http_delete(path(VMC::APPS_PATH, name))
+    http_get("http://tsuru.plataformas.glb.com:4000/apps/#{name}/delete")
   end
 
   def run(name, command)
-    check_login_status
+    #check_login_status
     upload_data = {:_method => 'post'}
     upload_data[:command] = command
-    status, body, headers = http_post(path(VMC::APPS_PATH, name, "run"), upload_data)
+    #status, body, headers = http_post(path(VMC::APPS_PATH, name, "run"), upload_data)
+    status, body, headers = http_post("http://tsuru.plataformas.glb.com:4000/apps/#{name}/run", upload_data)
     json_parse(body)
   end
 
@@ -135,7 +138,7 @@ class VMC::Client
   end
 
   def app_stats(name)
-    check_login_status
+    #check_login_status
     stats_raw = json_get(path(VMC::APPS_PATH, name, "stats"))
     stats = []
     stats_raw.each_pair do |k, entry|
@@ -174,61 +177,66 @@ class VMC::Client
 
   # listing of services that are available in the system
   def services
-    check_login_status
-    json_get(VMC::SERVICES_PATH)
+    #check_login_status
+    #json_get(VMC::SERVICES_PATH)
+    json_get("http://tsuru.plataformas.glb.com:4000/services")
   end
 
   def create_service(service, name)
-    check_login_status
-    services = services_info
-    services ||= []
+    #check_login_status
+    #services = services_info
+    #services ||= []
     service_hash = nil
 
-    service = service.to_s
 
-    # FIXME!
-    services.each do |service_type, value|
-      value.each do |vendor, version|
-        version.each do |version_str, service_descr|
-          if service == service_descr[:vendor]
-            service_hash = {
-              :type => service_descr[:type], :tier => 'free',
-              :vendor => service, :version => version_str
-            }
-            break
-          end
-        end
-      end
+    services = [{mysql: {type: "mysql"}}]
+
+    if service == services[0][:mysql][:type]
+      service_hash = {
+        type: services[0][:mysql][:type],
+        name: name
+      }
     end
 
+    service = service.to_s
+
     raise TargetError, "Service [#{service}] is not a valid service choice" unless service_hash
-    service_hash[:name] = name
-    json_post(path(VMC::SERVICES_PATH), service_hash)
+    json_post("http://tsuru.plataformas.glb.com:4000/services", service_hash)
   end
 
   def delete_service(name)
-    check_login_status
-    svcs = services || []
-    names = svcs.collect { |s| s[:name] }
-    raise TargetError, "Service [#{name}] not a valid service" unless names.include? name
-    http_delete(path(VMC::SERVICES_PATH, name))
+    # check_login_status
+    #svcs = services || []
+    # names = svcs.collect { |s| s[:name] }
+    # raise TargetError, "Service [#{name}] not a valid service" unless names.include? name
+    http_get("http://tsuru.plataformas.glb.com:4000/services/#{name}")
   end
 
   def bind_service(service, appname)
-    check_login_status
-    app = app_info(appname)
-    services = app[:services] || []
-    app[:services] = services << service
-    update_app(appname, app)
+    # check_login_status
+    #app = app_info(appname)
+    #services = app[:services] || []
+    #app[:services] = services << service
+    #update_app(appname, app)
+    bind_hash = {
+      service: service,
+      app: appname
+    }
+    json_post("http://tsuru.plataformas.glb.com:4000/services/bind", bind_hash)
   end
 
   def unbind_service(service, appname)
-    check_login_status
-    app = app_info(appname)
-    services = app[:services] || []
-    services.delete(service)
-    app[:services] = services
-    update_app(appname, app)
+    # check_login_status
+    # app = app_info(appname)
+    # services = app[:services] || []
+    # services.delete(service)
+    # app[:services] = services
+    # update_app(appname, app)
+    bind_hash = {
+      service: service,
+      app: appname
+    }
+    json_post("http://tsuru.plataformas.glb.com:4000/services/bind", bind_hash)
   end
 
   ######################################################
@@ -398,8 +406,6 @@ class VMC::Client
       :timeout => 60 * 60 * 24 * 1000,
       :open_timeout => 60 * 60 * 24 * 1000
     }
-    puts "path #{path}"
-    puts "req #{req}"
     status, body, response_headers = perform_http_request(req)
 
     if request_failed?(status)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vmc-tsuru
 version: !ruby/object:Gem::Version
-  version: 0.1.alpha
+  version: 0.2.alpha
   prerelease: 4
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-22 00:00:00.000000000Z
+date: 2012-03-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_pure