magellan-cli 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12b3f02bfad73d1bddf6848b0ccf548e7ef47f9d
-  data.tar.gz: 86a422744a194314c4aae67c5a68798563a5f953
+  metadata.gz: e376d8606b10e07ef39118cf792f277fe3bea4b0
+  data.tar.gz: 384542ebb224be59570cdfbf8070683753dde5fa
 SHA512:
-  metadata.gz: 965538b48afba1383a37268b53f56b4c9fabec4ad4cbaa2697d319a3881803f1b332af4cbb49d1d6ce48437c1db71eb38156a437cc68136175f98820425da94e
-  data.tar.gz: 2ce205b5976b03490a1abc8d813b5ef1b2202cc82bb87ec3123560b4cdd4cb6a10c47ce8e37e9b3a70c51896472d457fbede2ba2a74710076f67c226d9b72143
+  metadata.gz: a6b8495712afa5a10cb0e81d64bf139acc2016fe36a042f697fd31d83ee97e97c43b8e40516485f664a21d4ba91223a7ccd494554e109a6c73d3f3ca856edf20
+  data.tar.gz: ac1be6b59fbcd12181f3a66054f7528530114ebd40ae19e272bbc4ffcb3e0708dd833f047a01f8b646169c6af1d61d59d04b93bf90b6c2f3989d33abd6a380b5

data/Gemfile.lock

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

data/lib/magellan/cli/gem_update.rb

@@ -1,5 +1,6 @@
 require "magellan/cli"
 
+require 'time'
 require 'thor'
 require 'active_support/core_ext/string/inflections'
 

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

@@ -17,8 +17,8 @@ module Magellan
           desc "#{m} PATH", I18n.t(m, scope: [:messaging, :http])
           method_option :headers, aliases: "-H", desc: I18n.t(:headers, scope: [:messaging, :http, :common_options])
           module_eval(<<-EOM, __FILE__, __LINE__ + 1)
-            def #{m}(path, headers = nil)
-              res = core.request(path, :#{m}, nil, try_reading_hash(headers) || {})
+            def #{m}(path)
+              res = core.request(path, :#{m}, nil, try_reading_hash(options[:headers]) || {})
               puts_res(res)
             end
           EOM
@@ -29,8 +29,8 @@ module Magellan
           method_option :body   , aliases: "-d", desc: I18n.t(:body   , scope: [:messaging, :http, :common_options])
           method_option :headers, aliases: "-H", desc: I18n.t(:headers, scope: [:messaging, :http, :common_options])
           module_eval(<<-EOM, __FILE__, __LINE__ + 1)
-            def #{m}(path, body, headers = nil)
-              res = core.request(path, :#{m}, try_reading_file(body), try_reading_hash(headers) || {})
+            def #{m}(path)
+              res = core.request(path, :#{m}, try_reading_file(options[:body]), try_reading_hash(options[:headers]) || {})
               puts_res(res)
             end
           EOM

data/lib/magellan/cli/version.rb

@@ -1,5 +1,5 @@
 module Magellan
   module Cli
-    VERSION = "0.5.2"
+    VERSION = "0.5.3"
   end
 end

data/spec/magellan/cli/messaging/http_body.json

@@ -0,0 +1,4 @@
+{
+    "foo": 100,
+    "bar": 200,
+}

data/spec/magellan/cli/messaging/http_body.txt

@@ -0,0 +1,6 @@
+free style text
+
+```
+foo=100
+bar=200
+```

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

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 require 'spec_helper'
+require 'thor/core_ext/hash_with_indifferent_access'
 
 describe Magellan::Cli::Messaging::Http do
 
@@ -10,34 +11,86 @@ describe Magellan::Cli::Messaging::Http do
 
   let(:success_res){ double(:res, code: 200, body: "SUCCESS!\n") }
   let(:failure_res){ double(:res, code: 401, body: "NOT FOUND!\n") }
-  
-  describe :get do
-    it "path only" do
-      expect(core).to receive(:request).with("/foo", :get, nil, {}).and_return(success_res)
-      cmd.get("/foo")
-    end
-    it "path only(401 error)" do
-      expect(core).to receive(:request).with("/foo", :get, nil, {}).and_return(failure_res)
-      cmd.get("/foo")
-    end
-    it "path and query string" do
-      expect(core).to receive(:request).with("/foo?bar=baz", :get, nil, {}).and_return(success_res)
-      cmd.get("/foo?bar=baz")
-    end
-    it "path and headers" do
-      expect(core).to receive(:request).with("/foo", :get, nil, {"bar" => "baz"}).and_return(success_res)
-      cmd.get("/foo", '{"bar":"baz"}')
-    end
 
-    let(:header_content){ YAML.load_file(File.expand_path("../http_headers.yml", __FILE__)) }
-    it "path and headers yaml file" do
-      expect(core).to receive(:request).with("/foo", :get, nil, header_content).and_return(success_res)
-      cmd.get("/foo", File.expand_path("../http_headers.yml", __FILE__))
-    end
-    it "path and headers json file" do
-      expect(core).to receive(:request).with("/foo", :get, nil, header_content).and_return(success_res)
-      cmd.get("/foo", File.expand_path("../http_headers.json", __FILE__))
+  [:get, :delete, :post, :put, :patch].each do |http_method|
+    describe http_method do
+      it "path only" do
+        expect(core).to receive(:request).with("/foo", http_method, nil, {}).and_return(success_res)
+        cmd.send(http_method, "/foo")
+      end
+      it "path only(401 error)" do
+        expect(core).to receive(:request).with("/foo", http_method, nil, {}).and_return(failure_res)
+        cmd.send(http_method, "/foo")
+      end
+      it "path and query string" do
+        expect(core).to receive(:request).with("/foo?bar=baz", http_method, nil, {}).and_return(success_res)
+        cmd.send(http_method, "/foo?bar=baz")
+      end
+      it "path and headers" do
+        expect(core).to receive(:request).with("/foo", http_method, nil, {"bar" => "baz"}).and_return(success_res)
+        cmd.options = Thor::CoreExt::HashWithIndifferentAccess.new headers: '{"bar":"baz"}'
+        cmd.send(http_method, "/foo")
+      end
+
+      let(:header_content){ YAML.load_file(File.expand_path("../http_headers.yml", __FILE__)) }
+      it "path and headers yaml file" do
+        expect(core).to receive(:request).with("/foo", http_method, nil, header_content).and_return(success_res)
+        cmd.options = Thor::CoreExt::HashWithIndifferentAccess.new headers: File.expand_path("../http_headers.yml", __FILE__)
+        cmd.send(http_method, "/foo")
+      end
+      it "path and headers json file" do
+        expect(core).to receive(:request).with("/foo", http_method, nil, header_content).and_return(success_res)
+        cmd.options = Thor::CoreExt::HashWithIndifferentAccess.new "headers" => File.expand_path("../http_headers.json", __FILE__)
+        cmd.send(http_method, "/foo")
+      end
     end
   end
 
+  [:post, :put, :patch].each do |http_method|
+    describe "#{http_method} with body" do
+      text = "foo\nbar\n\nbazbazbaz"
+      text_filename = File.expand_path("../http_body.txt" , __FILE__)
+      json_filename = File.expand_path("../http_body.json", __FILE__)
+      [
+        ["text"     , text         , text],
+        ["text file", text_filename, File.read(text_filename)],
+        ["JSON file", json_filename, File.read(json_filename)],
+      ].each do |context_nane, arg, expected|
+        context context_nane do
+          it "path only" do
+            expect(core).to receive(:request).with("/foo", http_method, expected, {}).and_return(success_res)
+            cmd.options = Thor::CoreExt::HashWithIndifferentAccess.new body: arg
+            cmd.send(http_method, "/foo")
+          end
+          it "path only(401 error)" do
+            expect(core).to receive(:request).with("/foo", http_method, expected, {}).and_return(failure_res)
+            cmd.options = Thor::CoreExt::HashWithIndifferentAccess.new body: arg
+            cmd.send(http_method, "/foo")
+          end
+          it "path and query string" do
+            expect(core).to receive(:request).with("/foo?bar=baz", http_method, expected, {}).and_return(success_res)
+            cmd.options = Thor::CoreExt::HashWithIndifferentAccess.new body: arg
+            cmd.send(http_method, "/foo?bar=baz")
+          end
+          it "path and headers" do
+            expect(core).to receive(:request).with("/foo", http_method, expected, {"bar" => "baz"}).and_return(success_res)
+            cmd.options = Thor::CoreExt::HashWithIndifferentAccess.new body: arg, headers: '{"bar":"baz"}'
+            cmd.send(http_method, "/foo")
+          end
+
+          let(:header_content){ YAML.load_file(File.expand_path("../http_headers.yml", __FILE__)) }
+          it "path and headers yaml file" do
+            expect(core).to receive(:request).with("/foo", http_method, expected, header_content).and_return(success_res)
+            cmd.options = Thor::CoreExt::HashWithIndifferentAccess.new body: arg, headers: File.expand_path("../http_headers.yml", __FILE__)
+            cmd.send(http_method, "/foo")
+          end
+          it "path and headers json file" do
+            expect(core).to receive(:request).with("/foo", http_method, expected, header_content).and_return(success_res)
+            cmd.options = Thor::CoreExt::HashWithIndifferentAccess.new "body" => arg, "headers" => File.expand_path("../http_headers.json", __FILE__)
+            cmd.send(http_method, "/foo")
+          end
+        end
+      end
+    end
+  end
 end

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

@@ -0,0 +1,43 @@
+# -*- coding: utf-8 -*-
+require 'spec_helper'
+require 'thor/core_ext/hash_with_indifferent_access'
+
+describe Magellan::Cli::Messaging::Mqtt do
+
+  let(:cmd){ Magellan::Cli::Messaging::Mqtt.new }
+
+  let(:core){ double(:core) }
+  before{ allow(cmd).to receive(:core).and_return(core) }
+
+  let(:success_res){ double(:res, code: 200, body: "SUCCESS!\n") }
+  let(:failure_res){ double(:res, code: 401, body: "NOT FOUND!\n") }
+
+  describe :pub do
+    it do
+      expect(core).to receive(:publish).with("foo.bar", "payload")
+      cmd.pub("foo.bar", "payload")
+    end
+  end
+
+  describe :get do
+    it "without argument" do
+      expect(core).to receive(:get_message)
+      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("")
+    end
+
+    it "with topic" do
+      expect(core).to receive(:get_message).with("foo.bar")
+      cmd.get("foo.bar")
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: magellan-cli
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - akm2000
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-02 00:00:00.000000000 Z
+date: 2015-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
@@ -248,9 +248,12 @@ files:
 - spec/magellan/cli/file_access_spec.rb
 - spec/magellan/cli/login_page.html
 - spec/magellan/cli/login_spec.rb
+- spec/magellan/cli/messaging/http_body.json
+- spec/magellan/cli/messaging/http_body.txt
 - spec/magellan/cli/messaging/http_headers.json
 - spec/magellan/cli/messaging/http_headers.yml
 - spec/magellan/cli/messaging/http_spec.rb
+- spec/magellan/cli/messaging/mqtt_spec.rb
 - spec/magellan/cli/resources/client_version_spec.rb
 - spec/magellan/cli/resources/organization_spec.rb
 - spec/magellan/cli/resources/project_spec.rb
@@ -288,9 +291,12 @@ test_files:
 - spec/magellan/cli/file_access_spec.rb
 - spec/magellan/cli/login_page.html
 - spec/magellan/cli/login_spec.rb
+- spec/magellan/cli/messaging/http_body.json
+- spec/magellan/cli/messaging/http_body.txt
 - spec/magellan/cli/messaging/http_headers.json
 - spec/magellan/cli/messaging/http_headers.yml
 - spec/magellan/cli/messaging/http_spec.rb
+- spec/magellan/cli/messaging/mqtt_spec.rb
 - spec/magellan/cli/resources/client_version_spec.rb
 - spec/magellan/cli/resources/organization_spec.rb
 - spec/magellan/cli/resources/project_spec.rb