pi 0.1.32 → 0.1.33

data/README

@@ -53,10 +53,10 @@ _Copyright 2010-2012, Samsung.
 
 3. Help
 
-    "Usage: pi [options] command [<args>] [command_options]\n" +
-    "Try 'pi help [command]' or 'pi help options' for more information."
-    
-  Currently available pi commands are:
+Usage: pi [options] command [<args>] [command_options]
+Try 'pi help [command]' or 'pi help options' for more information.
+
+Currently available pi commands are:
 
   User
     login [url] [--user,--password]                             Login
@@ -109,8 +109,6 @@ _Copyright 2010-2012, Samsung.
     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
@@ -125,7 +123,7 @@ _Copyright 2010-2012, Samsung.
     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
@@ -155,14 +153,14 @@ wangjing@wangjing-pc:~$ pi login staging.samsungcloud.org --user wangjing --pass
 Successfully logged into [http://staging.samsungcloud.org]
 
 wangjing@wangjing-pc:~$ pi version
-pi 0.1.29
+pi 0.1.32
 
 wangjing@wangjing-pc:~$ pi info
 
 Name: api
 Description: CloudPi API Component
-Build: nightly-20120907045013-39
-Version: coulibiac-17cd22
+Build: nightly-20121011055902-110
+Version: coulibiac-21463d
 
 wangjing@wangjing-pc:~$ pi help
 
@@ -222,8 +220,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
@@ -238,7 +234,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
@@ -260,7 +256,7 @@ wangjing@wangjing-pc:~$ pi help options
 
 Available options:
 
-        --user USER
+         --user USER
         --password PASS
         --name NAME
         --email EMAIL
@@ -270,7 +266,6 @@ Available options:
         --projectid ID
         --target TARG
         --instance N
-        --type TYPE
         --value VALUE
         --service SERVICE
         --dns DNS
@@ -305,7 +300,8 @@ wangjing@wangjing-pc:~$ pi targets
 | Name      | URL                               |
 +-----------+-----------------------------------+
 | bst-dev   | http://bst-dev.samsungcloud.org   |
-| test-farm | http://test-farm.samsungcloud.org |
+| target-hq | http://target-hq.samsungcloud.org |
+| func-test | http://func-test.samsungcloud.org |
 +-----------+-----------------------------------+
 
 wangjing@wangjing-pc:~$ pi runtimes
@@ -386,7 +382,8 @@ Uploading "spring4mysql-master-slave.war": .....................................
 
 wangjing@wangjing-pc:~$ pi create-app
 1: bst-dev
-2: test-farm
+2: target-hq
+3: func-test
 Select Target: 1
 Selected Target: bst-dev
 Application Name: spring4mysql
@@ -407,7 +404,7 @@ Need debug? [yN]: y
 1: restart
 2: notify
 Reaction when service changed [notify]: 1
-Need monitor? [yN]: y
+Need JMX monitoring? [yN]: y
 Creating application "spring4mysql": ....................................Success to create appliation.
 
 wangjing@wangjing-pc:~$ pi apps
@@ -476,9 +473,6 @@ Select service: 3
 1: bst-dev
 2: test-farm
 Select target: 1
-1: App Service
-2: Session Service
-Select service type: 1
 OK
 
 wangjing@wangjing-pc:~$ pi bind-service

data/lib/cli/choose_helper.rb

@@ -101,12 +101,21 @@ module PI::Cli
       apps.each do |a|
         app_choices << a[:name]
       end
-      appname = ask "Select Application", :choices => app_choices, :indexed => true
-      display "Selected Application: ",false
-      display "#{appname}"
-      apps.each do |a|
-        return a if a[:name] == appname
-      end
+      loop{
+        appname = ask "Select Application", :choices => app_choices, :indexed => true
+        flag = false
+        apps.each do |a|
+          if a[:name] == appname
+            flag = true
+            return a 
+          end
+        end
+        if flag == false
+          display "Please input the right choice!"
+          next
+        end
+      }
+      
     end
     
     def choose_app_help(appid_or_appname)

data/lib/cli/interact_helper.rb

@@ -212,7 +212,12 @@ module PI::Cli
       # elsif choices and ans =~ /^\s*(\d+,)*\d+\s*$/ and \
       elsif choices and ans =~ /^\s*(\d+,)+\d+\s*$/ and \
           ans.to_i - 1 >= 0 
-          ans = ans.split(",")
+          ans = ans.split(",")         
+          ans_uniq = ans.uniq
+          unless ans_uniq == ans
+            puts "Numbers repeat, please try again!" 
+            return [false, nil]
+          end         
           res = Array.new
           ans.each do |a|
             if a.to_i - 1 < choices.to_a.size

data/lib/cli/version.rb

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

metadata

@@ -1,219 +1,202 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: pi
-version: !ruby/object:Gem::Version 
-  hash: 91
+version: !ruby/object:Gem::Version
+  version: 0.1.33
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 32
-  version: 0.1.32
 platform: ruby
-authors: 
+authors:
 - Samsung
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-10-13 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-10-19 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: json_pure
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 1
-        - 5
-        - 1
+      - !ruby/object:Gem::Version
         version: 1.5.1
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: highline
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 6
-        - 1
+      - !ruby/object:Gem::Version
+        version: 1.5.1
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 1.6.1
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: interact
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 0
-        - 4
-        - 7
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.1
+- !ruby/object:Gem::Dependency
+  name: interact
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.4.7
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rest-client
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 6
-        - 1
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.4.7
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.6.1
     - - <
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 7
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.7.0
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: terminal-table
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.1
+    - - <
+      - !ruby/object:Gem::Version
+        version: 1.7.0
+- !ruby/object:Gem::Dependency
+  name: terminal-table
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 4
-        - 2
+      - !ruby/object:Gem::Version
         version: 1.4.2
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.4.2
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 3
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.3.0
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: webmock
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 5
-        - 0
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 1.5.0
   type: :development
-  version_requirements: *id008
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.5.0
 description: Pi Command Line Tool
 email: bstpaas@gmail.com
-executables: 
+executables:
 - pi
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README
-files: 
+files:
 - README
 - Rakefile
-- lib/cli/config.rb
-- lib/cli/version.rb
+- lib/pi.rb
+- lib/pi/const.rb
+- lib/pi/client.rb
+- lib/cli/choose_helper.rb
 - lib/cli/errors.rb
-- lib/cli/core_ext.rb
-- lib/cli/commands/misc.rb
-- lib/cli/commands/base.rb
-- lib/cli/commands/services.rb
-- lib/cli/commands/dns.rb
-- lib/cli/commands/apps.rb
+- lib/cli/runner.rb
+- lib/cli/config.rb
+- lib/cli/interact_helper.rb
 - lib/cli/commands/user.rb
+- lib/cli/commands/apps.rb
+- lib/cli/commands/base.rb
 - lib/cli/commands/projects.rb
-- lib/cli/interact_helper.rb
-- lib/cli/runner.rb
+- lib/cli/commands/dns.rb
+- lib/cli/commands/services.rb
+- lib/cli/commands/misc.rb
+- lib/cli/version.rb
 - lib/cli/usage.rb
-- lib/cli/choose_helper.rb
-- lib/pi.rb
-- lib/pi/const.rb
-- lib/pi/client.rb
+- lib/cli/core_ext.rb
 - lib/cli.rb
 - bin/pi
 homepage: http://www.samsungcloud.org/
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Commandline tool that provides access to Samsung Cloud Platform.
 test_files: []
-