magellan-cli 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6822ae7470f8d854e23be149d385edff69982f52
-  data.tar.gz: f9e5d1b59d98afcb59c092975b8425951001c0ee
+  metadata.gz: 03189f4a29db6e906722930292cd0a8c04a0f427
+  data.tar.gz: d04ed9c6aed9d01a96952406d351284a76f92628
 SHA512:
-  metadata.gz: 4a0831855a1eb4cf2b6838e588a515885309d303cf9bb254ebf35abdcaca15ab7ca159ff15188cc7cce825e3e8f4be0b38c79087de44ffead7f7bd41d2456944
-  data.tar.gz: 9b8adb3ab02f677517c895ce2798e190f138f86108de78f8b3b5977264e331ee3a5d3a76d4d8b5b2873cfcad51291645ff08f2c75223b7a0cbd4c70861917c82
+  metadata.gz: 6072a300a3dead9f8c23f3a9ca6f42476ffedad62957d5c9fd29f6f3993b3136e0a60f599c4b7fe76daf2040db7522f1318ab985a87581613c17bda914eff299
+  data.tar.gz: 673aa8ed35d8ef3912ef4ef1b316c92ffe425cf956a25e083affdc8dc1fffa979e3141bf589c789107644a1be7ff360860bb8348d477372cdd14ff8c3d0d3edc

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    magellan-cli (0.5.4)
+    magellan-cli (0.5.5)
       activesupport (~> 4.1.4)
       groovenauts-thor
       httpclient (~> 2.5)

data/lib/magellan/cli/base.rb

@@ -47,6 +47,12 @@ module Magellan
           log_verbose(caller.join("\n  "))
           raise Cli::Error, msg
         end
+
+        def show_error_and_exit1(e)
+          log_error "[#{e.class}] #{e.message}"
+          log_verbose("  " << e.backtrace.join("\n  "))
+          exit(1)
+        end
       end
 
       class << self

data/lib/magellan/cli/messaging/mqtt.rb

@@ -8,11 +8,18 @@ module Magellan
         desc "pub TOPIC PAYLOAD", I18n.t(:pub, scope: [:messaging, :mqtt])
         def pub(topic, payload)
           core.publish(topic, try_reading_file(payload).dup)
+          log_success "\e[32mOK\e[0m"
+        rescue => e
+          show_error_and_exit1(e)
         end
 
         desc "get [TOPIC]", I18n.t(:get, scope: [:messaging, :mqtt])
         def get(topic = nil)
-          core.get_message(topic)
+          topic, payload = *core.get_message(topic)
+          $stderr.puts topic
+          $stdout.puts payload.ascii_only? ? payload : payload.inspect
+        rescue => e
+          show_error_and_exit1(e)
         end
 
       end

data/lib/magellan/cli/version.rb

@@ -1,5 +1,5 @@
 module Magellan
   module Cli
-    VERSION = "0.5.4"
+    VERSION = "0.5.5"
   end
 end

data/spec/magellan/cli/messaging/mqtt_spec.rb

@@ -14,30 +14,46 @@ describe Magellan::Cli::Messaging::Mqtt do
 
   describe :pub do
     it do
-      expect(core).to receive(:publish).with("foo.bar", "payload")
+      expect(core).to receive(:publish).with("foo.bar", "payload").and_return(nil)
+      cmd.pub("foo.bar", "payload")
+    end
+
+    it "show error" do
+      msg = "Something wrong!"
+      expect(core).to receive(:publish).with("foo.bar", "payload").and_raise(msg)
+      expect(cmd).to receive(:exit).with(1)
+      expect($stderr).to receive(:puts).with("\e[31m[RuntimeError] #{msg}\e[0m")
       cmd.pub("foo.bar", "payload")
     end
   end
 
   describe :get do
     it "without argument" do
-      expect(core).to receive(:get_message)
+      expect(core).to receive(:get_message).and_return(["topic", "payload"])
+      expect($stderr).to receive(:puts).with("topic")
+      expect($stdout).to receive(:puts).with("payload")
       cmd.get
     end
 
-    it "with nil" do
-      expect(core).to receive(:get_message).with(nil)
-      cmd.get(nil)
-    end
-
-    it "with blank string" do
-      expect(core).to receive(:get_message).with("")
-      cmd.get("")
+    [
+     ["with nil"         , nil    ],
+     ["with blank string", ""     ],
+     ["with topic"       , "topic"],
+    ].each do |subject, arg|
+      it subject do
+        expect(core).to receive(:get_message).with(arg).and_return(["topic", "payload"])
+        expect($stderr).to receive(:puts).with("topic")
+        expect($stdout).to receive(:puts).with("payload")
+        cmd.get(arg)
+      end
     end
 
-    it "with topic" do
-      expect(core).to receive(:get_message).with("foo.bar")
-      cmd.get("foo.bar")
+    it "show error" do
+      msg = "Something wrong!"
+      expect(core).to receive(:get_message).with("topic").and_raise(msg)
+      expect(cmd).to receive(:exit).with(1)
+      expect($stderr).to receive(:puts).with("\e[31m[RuntimeError] #{msg}\e[0m")
+      cmd.get("topic")
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: magellan-cli
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - akm2000