heywatch 1.2.2 → 1.2.3

data/bin/heywatch

@@ -17,10 +17,10 @@ else
       print "#{f}: ".capitalize
       data[f] = $stdin.gets.chomp
     end
-  
+
     [:password, :password_confirmation].each do |f|
       print "#{f}: ".capitalize.gsub("_", " ")
-      system "stty -echo"      
+      system "stty -echo"
       data[f] = $stdin.gets.chomp
       system "stty echo"
       puts
@@ -28,7 +28,7 @@ else
 
     print "Is the information correct? (Y/n) "
     exit if $stdin.gets.chomp.downcase != "y"
-  
+
     begin
       HeyWatch.register(data)
       user, passwd = data[:login], data[:password]
@@ -45,10 +45,10 @@ else
     system "stty echo"
     puts
   end
-  
+
   # testing credentials
   begin
-    HeyWatch.new(user, passwd)  
+    HeyWatch.new(user, passwd)
     File.open(config_file, "w") {|f| f.write("#{user}\n#{passwd}") }
     File.chmod(0600, config_file)
     puts "Your credentials have been saved in this file #{config_file} (0600)\n-----\n"
@@ -67,15 +67,15 @@ begin
     Resources:
 
       account       # manage account       | create, update
-      video         # manage video         | all, info, delete, count, bin            
-      encoded_video # manage encoded video | all, info, delete, count, bin, jpg       
-      download      # manage download      | all, info, delete, count, create         
-      job           # manage job           | all, info, delete, count, create         
-      format        # manage format        | all, info, delete, count, create, update 
-      upload        # upload a video       
-    
+      video         # manage video         | all, info, delete, count, bin
+      encoded_video # manage encoded video | all, info, delete, count, bin, jpg
+      download      # manage download      | all, info, delete, count, create
+      job           # manage job           | all, info, delete, count, create
+      format        # manage format        | all, info, delete, count, create, update
+      upload        # upload a video
+
     Usage:
-    
+
       heywatch account
       heywatch account:update env=sandbox
       heywatch video:info 123456
@@ -90,12 +90,12 @@ begin
     )
     exit
   end
-  
+
   if ARGV.size == 1 and ARGV[0] == "account"
     puts JSON.pretty_generate(hw.account)
     exit
   end
-  
+
   resource, method = ARGV[0].split(":")
   params = ARGV[1..-1]
   if method.nil?
@@ -107,7 +107,7 @@ begin
   end
 
   $stderr.puts [resource, method, params].inspect if ENV["DEBUG"]
-  
+
   if resource == "upload"
     path = ARGV[1]
     params = Hash[*ARGV[2..-1].map{|p| k,v = p.split("=") }.flatten]
@@ -117,23 +117,28 @@ begin
 
   if method == "create"
     params = Hash[*ARGV[1..-1].map{|p| k,v = p.split("=") }.flatten]
-    
+
     if resource == "account"
       puts JSON.pretty_generate(HeyWatch.register(params))
     else
-      puts JSON.pretty_generate(hw.send(method, *[resource, params]))
+      res = hw.send(method, *[resource, params])
+      if res.empty?
+        puts "ok"
+      else
+        puts JSON.pretty_generate(hw.send(method, *[resource, params]))
+      end
     end
     exit
   end
-  
+
   if method == "update"
     params = Hash[*ARGV[2..-1].map{|p| k,v = p.split("=") }.flatten]
-    
+
     hw.send(method, *[resource, ARGV[1], params])
     puts "ok"
     exit
   end
-  
+
   if method == "jpg"
     params = Hash[*ARGV[2..-1].map{|p| k,v = p.split("=") }.flatten]
     puts hw.send(method, *[ARGV[1], params])
@@ -144,18 +149,18 @@ begin
     puts hw.send(method, *[resource, ARGV[1]])
     exit
   end
-  
+
   if params.empty?
     res = hw.send(method, resource)
     if method == "count"
       puts res
       exit
     end
-    
+
     puts JSON.pretty_generate(res)
     exit
   end
-  
+
   if params.last =~ /\[([0-9\.-]+)\]/
     offset = eval($1)
     params = params[0..-2]
@@ -166,21 +171,21 @@ begin
     puts "ok"
     exit
   end
-  
+
   if res.is_a?(Fixnum)
     puts res
     exit
   end
-  
+
   if res.empty?
     exit
   end
-  
+
   res = res[offset] if offset
-  
+
   puts JSON.pretty_generate(res)
   exit
-  
+
 rescue => e
   puts e
   puts e.backtrace.join("\n") if ENV["DEBUG"]

data/lib/heywatch.rb

@@ -155,7 +155,7 @@ class HeyWatch
       return JSON.parse(res)
     end
 
-    return res
+    return res.to_s.strip
   rescue RestClient::BadRequest=> e
     raise BadRequest, e.http_body
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 2
-  - 2
-  version: 1.2.2
+  - 3
+  version: 1.2.3
 platform: ruby
 authors: 
 - Bruno Celeste
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-21 00:00:00 +01:00
+date: 2013-05-21 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency