enfcli 4.0.0 → 5.0.0.pre.alpha

data/lib/enfthor.rb

@@ -13,8 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-require 'thor'
-require 'terminal-table'
+require "thor"
+require "terminal-table"
 
 module EnfCli
   class EnfThor < Thor
@@ -23,9 +23,8 @@ module EnfCli
 
     # helper functions
     no_commands {
-
       def format_date(date)
-        DateTime.strptime("#{date}",'%s') if date
+        DateTime.strptime("#{date}", "%s") if date
       end
 
       def render_table(headings, rows, file = nil)
@@ -33,7 +32,7 @@ module EnfCli
         table.headings = headings
         table.rows = rows
         if file
-          open(expand_path(file), 'w') { |f|
+          open(expand_path(file), "w") { |f|
             f.puts table
           }
           say "#{rows.length} rows written to file #{file}", :yellow
@@ -58,17 +57,13 @@ module EnfCli
           yield
         rescue EnfApi::ERROR => e
           say e, :red
-
         rescue OpenSSL::SSL::SSLError => e
           say e, :red
           say "Host may not support https. Try http instead", :bold
-
         rescue => e
           say e, :red
         end
       end
-
-
     }
 
     # override help methods
@@ -81,6 +76,37 @@ module EnfCli
         text
       end
 
+      def handle_argument_error(command, error, args, arity)
+        begin
+          super(command, error, args, arity)
+        rescue Thor::InvocationError => e
+          msg = "#{e}"
+          msg = msg.gsub(/enfcli /, "") unless self == EnfCli::CLI
+          raise Thor::InvocationError, msg
+        end
+      end
+
+      def command_help(shell, command_name)
+        meth = normalize_command_name(command_name)
+        command = all_commands[meth]
+        handle_no_command_error(meth) unless command
+
+        ## HACK: format to display proper help message for help command run from shell
+        banner_text = banner(command)
+        banner_text = banner_text.gsub(/enfcli /, "") unless self == EnfCli::CLI
+
+        shell.say "Usage:"
+        shell.say "  #{banner_text}"
+        shell.say
+        class_options_help(shell, nil => command.options.values)
+        if command.long_description
+          shell.say "Description:"
+          shell.print_wrapped(command.long_description, :indent => 2)
+        else
+          shell.say command.description
+        end
+      end
+
       def help(shell, subcommand = false)
         list = printable_commands(true, subcommand)
         Thor::Util.thor_classes_in(self).each do |klass|
@@ -91,8 +117,7 @@ module EnfCli
         list.sort! { |a, b| a[0] <=> b[0] }
 
         # Add this line to remove the help-command itself from the output
-        list.reject! {|l| l[0].split[1] == 'help' or l[0].split[2] == 'help'}
-
+        list.reject! { |l| l[0].split[1] == "help" or l[0].split[2] == "help" }
 
         # Capture help message in a variable
         help_text = capture_stdout {
@@ -103,16 +128,15 @@ module EnfCli
         }
 
         ## HACK: format to display proper help message for help command run from shell
-        help_text = help_text.gsub(/enfcli /,"") unless self == EnfCli::CLI
+        help_text = help_text.gsub(/enfcli /, "") unless self == EnfCli::CLI
 
         # Print the actual help message
         shell.say help_text
 
         # Add this line if you want to print custom text at the end of your help output.
         # (similar to how Rails does it)
-        shell.say 'All commands can be run with -h (or --help) for more information.'
+        shell.say "All commands can be run with -h (or --help) for more information."
       end
     end
-
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enfcli
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 5.0.0.pre.alpha
 platform: ruby
 authors:
 - Venkatakumar Srinivasan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-10 00:00:00.000000000 Z
+date: 2020-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -52,6 +52,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: clipboard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ffi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: readline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -164,6 +206,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rufo
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - venkat@xaptum.com
@@ -185,7 +241,11 @@ files:
 - Rakefile
 - bin/enfcli
 - enfcli.gemspec
+- format.sh
 - lib/enfapi.rb
+- lib/enfapi/dns.rb
+- lib/enfapi/firewall.rb
+- lib/enfapi/user.rb
 - lib/enfcli.rb
 - lib/enfcli/commands/captive.rb
 - lib/enfcli/commands/user.rb
@@ -209,11 +269,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Xaptum ENF CLI.