pi 0.1.31 → 0.1.32

data/lib/cli/commands/apps.rb

@@ -11,7 +11,8 @@ module PI::Cli::Command
       "graceful"          => true,
       "lazy"              => true,
       "isDebug"           => false,
-      "needMonitor"       => false
+      "needMonitor"       => false,
+      "probe"             => false
     }
     
     def apps
@@ -174,8 +175,11 @@ module PI::Cli::Command
       isDebug = (isDebug == false ? "no" : "yes")
       choices = ["restart", "notify"]
       action_for_change = ask"Reaction when service changed", :default => DEFAULTS["action_for_change"], :choices => choices, :indexed => true
-      needMonitor = ask "Need monitor?", :default => DEFAULTS["needMonitor"]    
-      needMonitor = (needMonitor == false ? "no" : "yes")
+      probe = false
+      probe = ask "Need JMX monitoring?", :default => DEFAULTS["probe"] if deployType == "binary"
+      probe = (probe == false ? "no" : "yes")
+      # needMonitor = ask "Need monitor?", :default => DEFAULTS["needMonitor"]    
+      # needMonitor = (needMonitor == false ? "no" : "yes")
               
       manifest = {
         :targetName        => target,
@@ -190,7 +194,8 @@ module PI::Cli::Command
         :tag               => tag,
         :isDebug           => isDebug,
         :action_for_change => action_for_change,
-        :needMonitor       => needMonitor
+        :needMonitor       => "no",
+        :probe             => probe
         }
      
       display "Creating application \"#{appname}\": ",false
@@ -541,26 +546,33 @@ module PI::Cli::Command
       display logs[1]
     end
     
-    def app_debug(appid_or_appname=nil)
-      all_opts = total_opts
-      all_opts_except_valid_opts = all_opts.delete_if{ |key,value| key.to_s =~ /(target)/i}
-      all_opts_except_valid_opts.each_value do |value|
-        err "Invalid options" if value != nil
-      end
-      client.check_login_status
-      app, appid = choose_app_help_target_not_all(appid_or_appname)
-      appid = (appid == nil ? app[:id] : appid)
-      debug_info = client.app_debug_info(appid)
-      return display JSON.pretty_generate(debug_info) if @options[:json]
-      return display "No debug info" if debug_info.nil? || debug_info.empty?
-      debug_table = table do |t|
-        t.headings = 'Debug IP', 'Debug Port', 'State'
-        debug_info.each do |d|
-          t << [d[:debug_ip], d[:debug_port], d[:state]]
-        end
-      end
-      display debug_table
-    end
+    # def app_debug(appid_or_appname=nil)
+      # all_opts = total_opts
+      # all_opts_except_valid_opts = all_opts.delete_if{ |key,value| key.to_s =~ /(target)/i}
+      # all_opts_except_valid_opts.each_value do |value|
+        # err "Invalid options" if value != nil
+      # end
+      # client.check_login_status
+      # app, appid = choose_app_help_target_not_all(appid_or_appname)
+      # appid = (appid == nil ? app[:id] : appid)
+      # debug_info = client.app_debug_info(appid)
+      # return display JSON.pretty_generate(debug_info) if @options[:json]
+      # return display "No debug info" if debug_info.nil? || debug_info.empty?
+      # debug_table = table do |t|
+        # if app[:deployType] == "binary"
+          # t.headings = 'Index', 'Debug IP', 'Debug Port', 'State', 'Probe URL'
+          # debug_info.each do |d|
+            # t << [d[:index], d[:debug_ip], d[:debug_port], d[:state], d[:probe_url]]
+          # end
+        # else
+          # t.headings = 'Index', 'Debug IP', 'Debug Port', 'State'
+          # debug_info.each do |d|
+            # t << [d[:index], d[:debug_ip], d[:debug_port], d[:state]]
+          # end
+        # end
+      # end
+      # display debug_table
+    # end
     
     private 
    

data/lib/cli/commands/services.rb

@@ -196,10 +196,10 @@ module PI::Cli::Command
       end
       client.check_login_status
       target = @options[:target]
-      servicetype = @options[:type]
-      if servicetype
-        err "Invalid type. Please use --type 1 or --type 2" unless servicetype =~ /[1|2]/
-      end
+      # servicetype = @options[:type]
+      # if servicetype
+        # err "Invalid type. Please use --type 1 or --type 2" unless servicetype =~ /[1|2]/
+      # end
       if serviceid
         services = client.services
         err "No services" if services.nil? || services.empty?        
@@ -222,16 +222,17 @@ module PI::Cli::Command
       else
         target = ask"Select target", :choices => targets.collect { |t| t[:name] }, :indexed => true
       end      
-      unless servicetype
-        choices = ["App Service", "Session Service"]
-        servicetype = ask"Select service type", :choices => choices, :indexed => true
-        if servicetype == "App Service" 
-          servicetype = 1
-        else
-          servicetype = 2
-        end
-      end
-      client.register_service(serviceid, target, servicetype)
+      # unless servicetype
+        # choices = ["App Service", "Session Service"]
+        # servicetype = ask"Select service type", :choices => choices, :indexed => true
+        # if servicetype == "App Service" 
+          # servicetype = 1
+        # else
+          # servicetype = 2
+        # end
+      # end
+      # client.register_service(serviceid, target, servicetype)
+      client.register_service(serviceid, target)
       display "OK".green
     end
     

data/lib/cli/runner.rb

@@ -36,7 +36,7 @@ class PI::Cli::Runner
       opts.on('--projectid ID')    { |id|       @options[:projectid] = id }
       opts.on('--target TARG')     { |targ|     @options[:target] = targ }
       opts.on('--instance N', Integer)      { |inst|     @options[:instance] = inst }
-      opts.on('--type TYPE')       { |type|     @options[:type] = type }
+      # opts.on('--type TYPE')       { |type|     @options[:type] = type }
       opts.on('--value VALUE')     { |value|    @options[:value] = value }
       opts.on('--service SERVICE') { |service|  @options[:service] = service }
       opts.on('--dns DNS')         { |dns|      @options[:dns] = dns }
@@ -270,9 +270,9 @@ class PI::Cli::Runner
       usage('pi app-log [appid] [--instanceid,--file] or pi app-log <appname> <--target TARGET> [--instanceid,--file]')
       set_cmd(:apps, :app_log, @args.size == 1 ? 1 : 0)
       
-    when 'app-debug'     
-      usage('pi app-debug [appid] or pi app-log <appname> <--target TARGET>')
-      set_cmd(:apps, :app_debug, @args.size == 1 ? 1 : 0)
+    # when 'app-debug'     
+      # usage('pi app-debug [appid] or pi app-log <appname> <--target TARGET>')
+      # set_cmd(:apps, :app_debug, @args.size == 1 ? 1 : 0)
            
     ###############################################################################
     # Services
@@ -311,7 +311,7 @@ class PI::Cli::Runner
       set_cmd(:services, :check_service, @args.size == 1 ? 1 : 0) 
       
     when 'register-service'     
-      usage('pi register-service [serviceid] [--target TARGET] [--type TYPE]')
+      usage('pi register-service [serviceid] [--target TARGET]')
       set_cmd(:services, :register_service, @args.size == 1 ? 1 : 0)  
       
     when 'deregister-service'     

data/lib/cli/usage.rb

@@ -75,8 +75,6 @@ Currently available pi commands are:
     delete-env <appname> <--target TARGET> [--name NAME]        Delete the environment for the application
     app-log [appid] [--instanceid,--file]                       List the logs for the application
     app-log <appname> <--target TARGET> [--instanceid,--file]   List the logs for the application
-    app-debug [appid]                                           List the debug info for the application
-    app-debug <appname> <--target TARGET>                       List the debug info for the application
     
   Service
     app-service [appid]                                         Display the binded services for the application
@@ -91,7 +89,7 @@ Currently available pi commands are:
     import-service [url]                                        Import dedicated service
     check-service [serviceid]                                   Check availability for the service 
     delete-service [serviceid]                                  Delete the service
-    register-service [serviceid] [--target,--type]              Register to target
+    register-service [serviceid] [--target TARGET]              Register to target
     deregister-service [serviceid] [--target TARGET]            Deregister to target
     
   DNS

data/lib/cli/version.rb

@@ -1,5 +1,5 @@
 module PI
   module Cli
-    VERSION = '0.1.31'
+    VERSION = '0.1.32'
   end
 end

data/lib/pi/client.rb

@@ -285,7 +285,7 @@ class PI::Client
   
   def app_debug_info(appid)
     appid = uri_encode(appid)
-    json_get("#{PI::APP_PATH}/#{appid}/debug")
+    json_get("#{PI::APP_PATH}/#{appid}/instances")
   end
  
   #####################################################
@@ -351,11 +351,11 @@ class PI::Client
     json_get("#{PI::SERVICE_PATH}/servicetarget/#{serviceid}")
   end
   
-  def register_service(serviceid, targetname, servicetype, manifest={})
+  def register_service(serviceid, targetname, manifest={})
     serviceid = uri_encode(serviceid)
     targetname = uri_encode(targetname)
-    servicetype = uri_encode(servicetype)
-    json_post("#{PI::SERVICE_PATH}/register/#{targetname}/#{serviceid}?serviceType=#{servicetype}",manifest)
+    # servicetype = uri_encode(servicetype)
+    json_post("#{PI::SERVICE_PATH}/register/#{targetname}/#{serviceid}?serviceType=1",manifest)
   end
 
   def deregister_service(servicetargetid)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pi
 version: !ruby/object:Gem::Version 
-  hash: 37
+  hash: 91
   prerelease: 
   segments: 
   - 0
   - 1
-  - 31
-  version: 0.1.31
+  - 32
+  version: 0.1.32
 platform: ruby
 authors: 
 - Samsung
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-28 00:00:00 Z
+date: 2012-10-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json_pure