cogy 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e15ce0ee4619b458af94f3d11906117e1ef9e987
-  data.tar.gz: ef84ade1821bde53cbc22578613e0e2cab8475f9
+  metadata.gz: 28ec300393c739ebc8a9f7b3d84fb9934e8f9778
+  data.tar.gz: b685e1a2685d49340dbadf54550375a9689d2ac8
 SHA512:
-  metadata.gz: fbe156629d8120fa161bcc1dcedbb679b3e1574adaacc9d47416d710ed18da24b0b7338888be602ad101c7c09f4151ba4ecb48fc49f00eea23e6120ccaa43b07
-  data.tar.gz: f6f4665eb0daedb50227c1c3a653918bdbebde758065db578f3b5f4a2c4856f9654e27da096b6d24316a98f9c68545aa282d6e3c95a3b19236a0521ae3bc5e68
+  metadata.gz: 90b69b70b3b6a243ff59c6bf7ec4ea8f1c0e8ed6a88a9ea5b0579126c78e34a574379975ebcbdc3ee8a0ff54f40b5609893fcad0ee0bf2b72160712cb6ab7f9e
+  data.tar.gz: a944b9dafce7515bdf84a95547228ba832b11dfc1d02ce40ab16c136005ca7be0930f3022fcc2d384ff9c833cf79211b5897ad39afa2d896416083ac3a314643

data/README.md

@@ -93,7 +93,7 @@ Cogy.configure do |config|
   # directory relative to the root of your application.
   #
   # Default: ["cogy"]
-  config.command_load_paths = "cogy_commands/"
+  config.command_load_paths = "cogy"
 end
 
 ```
@@ -127,9 +127,27 @@ on "calc",
 end
 ```
 
-## Credits
+## Error template
 
-TODO
+When a command throws an error, the default error template is rendered, which
+is the following:
+
+    @<%= @user %>: Command '<%= @cmd %>' returned an error.
+
+    ```
+    <%= @exception.class %>:<%= @exception.message %>
+    ```
+
+However it can be overriden in the application by creating a view in
+`app/views/cogy/error.text.erb`.
+
+## Authors
+
+* [Agis Anastasopoulos](https://github.com/agis-)
+
+## License
+
+Cogy is licensed under MIT. See [LICENSE](LICENSE).
 
 
 

data/app/controllers/cogy/cogy_controller.rb

@@ -2,7 +2,7 @@ require_dependency "cogy/application_controller"
 
 module Cogy
   class CogyController < ApplicationController
-    # GET /cmd/:cmd/:user
+    # GET <mount_path>/cmd/:cmd/:user
     def command
       cmd = params[:cmd]
       args = request.query_parameters.select { |k,_| k !~ /\Acog_opt_/ }.values
@@ -10,7 +10,14 @@ module Cogy
         .transform_keys { |k| k.sub("cog_opt_", "") }
       user = params[:user]
 
-      render text: Cogy.commands[cmd].run!(args, opts, user)
+      begin
+        render text: Cogy.commands[cmd].run!(args, opts, user)
+      rescue => e
+        @user = user
+        @cmd = cmd
+        @exception = e
+        render "cogy/error"
+      end
     end
 
     # GET /inventory

data/app/views/cogy/error.text.erb

@@ -0,0 +1,5 @@
+@<%= @user %>: Command '<%= @cmd %>' returned an error.
+
+```
+<%= @exception.class %>:<%= @exception.message %>
+```

data/lib/cogy/version.rb

@@ -1,3 +1,3 @@
 module Cogy
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/cogy.rb

@@ -59,11 +59,17 @@ module Cogy
       config["commands"][name] = {
         "executable" => executable_path,
         "description" => cmd.desc,
-        "arguments" => cmd.formatted_args,
-        "options" => cmd.formatted_opts,
         "rules" => cmd.rules
       }
 
+      if !cmd.args.empty?
+        config["commands"][name]["arguments"] = cmd.formatted_args
+      end
+
+      if !cmd.opts.empty?
+        config["commands"][name]["options"] = cmd.formatted_opts
+      end
+
       if cmd.long_desc
         config["commands"][name]["long_description"] = cmd.long_desc
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cogy
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Agis Anastasopoulos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-01 00:00:00.000000000 Z
+date: 2016-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -51,11 +51,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- MIT-LICENSE
 - README.md
 - Rakefile
 - app/controllers/cogy/application_controller.rb
 - app/controllers/cogy/cogy_controller.rb
+- app/views/cogy/error.text.erb
 - config/routes.rb
 - lib/cogy.rb
 - lib/cogy/command.rb

data/MIT-LICENSE

@@ -1,20 +0,0 @@
-Copyright 2016 Agis Anastasopoulos
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.