pi 0.1.34 → 0.1.35

data/README

@@ -613,14 +613,6 @@ Available memory: 1536 M, maximum instances: 24
 Current instance: 1, Instance number: 2
 Scaling application: ................................Success to scale instances to 2
 
-wangjing@wangjing-pc:~$ pi app-debug 3213
-+-------------+------------+---------+
-| Debug IP    | Debug Port | State   |
-+-------------+------------+---------+
-| 23.22.37.20 | 48175      | RUNNING |
-| 23.22.37.20 | 50631      | RUNNING |
-+-------------+------------+---------+
-
 wangjing@wangjing-pc:~$ pi status 3213
 +-------------+---------+--------+-----------+---------+--------------+------------+
 | Instance ID | Status  | CPU(%) | Memory(M) | Disk(M) | RequestCount | ErrorCount |

data/lib/cli/choose_helper.rb

@@ -271,5 +271,8 @@ module PI::Cli
       (value =~ /^[^\'\"\\=]{1,18}$/) ? true : false
     end
 
+    def check_mem_valid?(value)
+      (value =~ /((64m)|(128m)|(256m)|(512m)|(1g)|(2g))/i) ? true : false
+    end
   end
 end

data/lib/cli/commands/apps.rb

@@ -148,7 +148,17 @@ module PI::Cli::Command
       url = "#{appname}.#{user[:userName]}.#{target}.samsungpaas.com"
       display "URL: #{url}"
       # choose the mem
-      mem = ask "Memory reservation", :default => DEFAULTS["mem"], :choices => ["64M", "128M", "256M", "512M", "1G", "2G"]
+      mem = nil
+      loop{
+        mem = ask "Memory reservation", :default => DEFAULTS["mem"], :choices => ["64M", "128M", "256M", "512M", "1G", "2G"], :indexed => true unless mem
+        if not check_mem_valid?(mem)
+          display "Invalid mem value '#{mem}'.".red
+          mem = nil
+          next
+        else
+          break
+        end
+      }
       # Set to MB number
       mem_quota = mem_choice_to_quota(mem)
 

data/lib/cli/commands/dns.rb

@@ -95,7 +95,7 @@ module PI::Cli::Command
       end
       client.check_login_status
       dns = client.dns
-      return display "No Services" if dns.nil? || dns.empty?
+      return display "No Dns" if dns.nil? || dns.empty?
       return display JSON.pretty_generate(dns) if @options[:json]
       dns.sort! {|a, b| a[:name] <=> b[:name] }
       dns_table = table do |t|

data/lib/cli/version.rb

@@ -1,5 +1,5 @@
 module PI
   module Cli
-    VERSION = '0.1.34'
+    VERSION = '0.1.35'
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pi
 version: !ruby/object:Gem::Version 
-  hash: 95
+  hash: 93
   prerelease: 
   segments: 
   - 0
   - 1
-  - 34
-  version: 0.1.34
+  - 35
+  version: 0.1.35
 platform: ruby
 authors: 
 - Samsung
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-07 00:00:00 Z
+date: 2012-12-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json_pure