irkit 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7758fde80d4656287936a75268bc2c77d1dd3493
-  data.tar.gz: 261ee3cac8bea21d0e18427910b48ba9c89791f5
+  metadata.gz: 0ce7272c56532c32aaedd21f2a3610563191485f
+  data.tar.gz: acebb9b4fd74740a49ff54221a5e7f092611bedb
 SHA512:
-  metadata.gz: c4e8c0cb95bb006a4764514eca3215a03a843afc3335f9775659fe8bcd99c22997828dfe27fc3923ca325eb8105a0c5b27e9ede8c4040bd116b98b6138f45379
-  data.tar.gz: 295625cae7b62b547803cd5a480eb20c6c553dc073d06c82bf152b571a5ff95f6dadd68b6271bdb13a358aeeb13cf0f1ba080cf4d0a006d70d00dc084eea35be
+  metadata.gz: 81f9a6d9bd0061a0205582f88e32d1dfb0dd05b3f07488fac8b869746148f5657b9c78c2b4ca9eacdea2dc0a30276ca5dbde7567d2c57b0143643ebcf9d31bbb
+  data.tar.gz: 7f4e86403ea1f8752885ebd3c2a8237ecee1c399ad5ebd353823e86bc2ef64e69f2ef72cf8ab6fb2a8766fab50e34d746ad420e699f2637ed476f0d27d9790ea

data/History.txt

@@ -1,3 +1,8 @@
+=== 0.0.4 2014-03-17
+
+* add --show option on irkit command
+* hide deviceid and clientkey on irkit command #2
+
 === 0.0.3 2014-03-17
 
 * fix irkit command  #1

data/bin/irkit

@@ -9,6 +9,7 @@ args = ArgsParser.parse ARGV do
   arg :get, "get IR Data", :alias => :read
   arg :post, "post IR Data", :alias => :write
   arg :delete, "delete IR Data"
+  arg :show, "print IR Data"
   arg :list, "show list of IR Data and Devices"
   arg :address, "IRKit IP Address"
   arg :device, "use Internet API"
@@ -28,7 +29,7 @@ if args.has_option? :help or
     (!args.has_param?(:get) and !args.has_param?(:post) and
      !args.has_option?(:list) and !args.has_param?(:delete) and
      !args.has_param?(:device) and !args.has_param?("device:add") and
-     !args.has_param?("device:delete"))
+     !args.has_param?("device:delete") and !args.has_param?(:show))
   STDERR.puts "IRKit v#{IRKit::VERSION}"
   STDERR.puts "      https://github.com/shokai/ruby-irkit"
   STDERR.puts
@@ -38,6 +39,7 @@ if args.has_option? :help or
   STDERR.puts " % #{binname} --get  tv_on"
   STDERR.puts " % #{binname} --post tv_on"
   STDERR.puts " % #{binname} --post tv_on --address 192.168.0.123"
+  STDERR.puts " % #{binname} --show tv_on"
   STDERR.puts " % #{binname} --delete tv_on"
   STDERR.puts " % #{binname} --device:add myhouse"
   STDERR.puts " % #{binname} --post tv_on --device myhouse"
@@ -48,11 +50,11 @@ end
 if args.has_option? :list
   puts "~> #{IRKit::App::DATA_FILE}"
   puts "== Data"
-  IRKit::App::Data.IR.each do |k,v|
+  IRKit::App::Data["IR"].each do |k,v|
     puts k
   end
   puts "== Devices"
-  IRKit::App::Data.Device.each do |k,v|
+  IRKit::App::Data["Device"].each do |k,v|
     puts "#{k}\tInternet API"
   end
   IRKit::Device.find.each do |device|
@@ -61,11 +63,17 @@ if args.has_option? :list
   exit
 end
 
+if args.has_param? :show
+  name = args[:show]
+  puts IRKit::App::Data["IR"][name].to_json
+  exit
+end
+
 if args.has_param? :delete
   name = args[:delete]
   print %Q{delete IR-Data "#{name}"? [Y/n] > }
   exit 1 if STDIN.gets.strip.downcase =~ /n/
-  IRKit::App::Data.IR.delete name
+  IRKit::App::Data["IR"].delete name
   IRKit::App::Data.save
   puts %Q{"#{name}" delete!}
   exit
@@ -75,7 +83,7 @@ if args.has_param? "device:delete"
   name = args["device:delete"]
   print %Q{delete Device "#{name}"? [Y/n] > }
   exit 1 if STDIN.gets.strip.downcase =~ /n/
-  IRKit::App::Data.Device.delete name
+  IRKit::App::Data["Device"].delete name
   IRKit::App::Data.save
   puts %Q{"#{name}" delete!}
   exit
@@ -84,12 +92,13 @@ end
 if args.has_param? :address
   irkit = IRKit::Device.new(address: args[:address])
 elsif args.has_param? :device
-  unless info = IRKit::App::Data.Device[ args[:device] ]
+  unless info = IRKit::App::Data["Device"][ args[:device] ]
     STDERR.puts %Q{Device "#{args[:device]}" not found}
     exit 1
   end
   irkit = IRKit::InternetAPI.new(clientkey: info.clientkey, deviceid: info.deviceid)
 else
+  puts "finding IRKit with bonjour..."
   irkit = IRKit::Device.find.first
 end
 
@@ -98,11 +107,11 @@ unless irkit
   exit 1
 end
 
-p irkit
+puts "using #{irkit}"
 
 if args.has_param? :get
   name = args[:get]
-  if IRKit::App::Data.IR.has_key? name
+  if IRKit::App::Data["IR"].has_key? name
     print %Q{overwrite "#{name}"? [Y/n] > }
     exit 1 if STDIN.gets.strip.downcase =~ /n/
   end
@@ -116,7 +125,7 @@ if args.has_param? :get
     ir_data = res
   end
   puts ir_data.to_json
-  IRKit::App::Data.IR[name] = ir_data
+  IRKit::App::Data["IR"][name] = ir_data
   IRKit::App::Data.save
   puts %Q{"#{name}" saved!}
   exit
@@ -125,7 +134,7 @@ end
 if args.has_param? :post
   name = args[:post]
   puts %Q{post "#{name}"}
-  unless ir_data = IRKit::App::Data.IR[name]
+  unless ir_data = IRKit::App::Data["IR"][name]
     STDERR.puts %Q{IR Data "#{name}" not found}
     exit 1
   end
@@ -140,7 +149,7 @@ end
 
 if args.has_param? "device:add"
   name = args["device:add"]
-  if IRKit::App::Data.Device.has_key? name
+  if IRKit::App::Data["Device"].has_key? name
     print %Q{overwrite "#{name}"? [Y/n] > }
     exit 1 if STDIN.gets.strip.downcase =~ /n/
   end
@@ -148,9 +157,9 @@ if args.has_param? "device:add"
   puts "token:\t#{token}"
   res = irkit.get_key_and_deviceid(token)
 
-  puts "clientkey:\t#{res.clientkey}"
-  puts "deviceid:\t#{res.deviceid}"
-  IRKit::App::Data.Device[name] = res
+  puts "clientkey:\t#{res.clientkey[0..6]}XXXXXX"
+  puts "deviceid:\t#{res.deviceid[0..6]}XXXXXX"
+  IRKit::App::Data["Device"][name] = res
   IRKit::App::Data.save
   puts %Q{"#{name}" saved!}
   exit

data/lib/irkit/device.rb

@@ -11,6 +11,10 @@ module IRKit
       "http://#{@address}"
     end
 
+    def to_s
+      inspect
+    end
+
     def get_messages
       res = HTTParty.get("#{url}/messages")
       case res.code

data/lib/irkit/internet_api.rb

@@ -15,6 +15,10 @@ module IRKit
       "https://api.getirkit.com/1"
     end
 
+    def to_s
+      %Q{#<#{self.class} @deviceid="#{@deviceid[0..6]}XXXXX" @clientkey="#{@clientkey[0..6]}XXXXX">}
+    end
+
     def get_messages(query={})
       opts = {
         :query => {:clientkey => @clientkey}

data/lib/irkit/version.rb

@@ -1,3 +1,3 @@
 module IRKit
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: irkit
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Sho Hashimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-16 00:00:00.000000000 Z
+date: 2014-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler