appcanary 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 284939affc1454e5a6d28abe108b4c9949288c2e
-  data.tar.gz: 59b656003a5ac8a4533377757197d79d25ca1784
+  metadata.gz: 76000ce63fdd1ce397b93e7a4152e1b591c1017f
+  data.tar.gz: '0984f418130bed51fe3b0038b92a1a1c35d561ea'
 SHA512:
-  metadata.gz: 201fd68b7ef60153da6d237043726f558c04ad23fcc430f1090def068ce5880c2982b1f5307d26feb6396121fd5415233675b9628e2a8a22a84e74c18f4b407f
-  data.tar.gz: a3f711c3e6997fe909af3225404472f7f4e27499b5daff2710a83e07e11292a1fd69788a2f639565aeacf5977c2c1af77d8a89b36e586c4871b68333dc530bb7
+  metadata.gz: 84cdae3c74b1b9bd1bbdf1cf16a3201a9205a2a95440e75fb68e8b607cd6e33bbdbd25294875e678298ed99d795462a1f02f80332e1fc263d4617e052377b524
+  data.tar.gz: e2daded1e92c193d4e1536fea763fd9308ea5c0a1194ef1f5295a989a8be86615771e7990c0b8ab18924e52b492ac53a7862dd872fe5be18e8bd4c75d665223f

data/bin/appcanary

@@ -1,77 +1,109 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
+require "rubygems"
 require "appcanary"
 require "optparse"
 
 class AppcanaryCLI
   class << self
-    def api_key_opt(opts)
+    TOP_LEVEL_HELP = <<-HELP
+Usage: appcanary check|update [options]
+
+Subcommands are:
+  check  -  Check your gem bundle for vulnerabilities
+  update -  Update an Appcanary monitor
+
+See "appcanary COMMAND --help" for more information about a specific command.
+    HELP
+
+    REQUIRED_PARAMS = {
+      api_key: "Must provide an API key.",
+      gemfile_lock_path: "Must provide a path to a Gemfile.lock",
+      monitor_name: "Must provide a monitor name"
+    }
+
+    REQUIRED = { "check" => [:api_key, :gemfile_lock_path],
+                 "update" => [:api_key, :gemfile_lock_path, :monitor_name] }
+
+    def api_key_opt(opts, vals)
       opts.on("-a", "--api-key API_KEY", :REQUIRED,
-              "Your Appcanary API key. Find it at https://appcanary.com/settings") do |ak|
+              "Your Appcanary API key. Required; find it at https://appcanary.com/settings") do |ak|
+        vals[:api_key] = ak
         Appcanary.api_key = ak
       end
     end
 
-    def gemfile_lock_opt(opts)
-      opts.on("-g", "--gemfile-lock GEMFILE_LOCK", :OPTIONAL,
-              "Path to the Gemfile.lock to ship to Appcanary") do |gl|
+    def gemfile_lock_opt(opts, vals)
+      opts.on("-g", "--gemfile-lock GEMFILE_LOCK", :REQUIRED,
+              "Path to the Gemfile.lock to ship to Appcanary. Required.") do |gl|
+        vals[:gemfile_lock_path] = gl
         Appcanary.gemfile_lock_path = gl
       end
     end
 
-    def base_uri_opt(opts)
+    def base_uri_opt(opts, vals)
       opts.on("-b", "--base-uri BASE_URI", :OPTIONAL,
               "The URL for the Appcanary endpoint to use.") do |bu|
         Appcanary.base_uri = bu
       end
     end
 
-    def monitor_name_opt(opts)
+    def monitor_name_opt(opts, vals)
       opts.on("-m", "--monitor-name MONITOR_NAME", :REQUIRED,
-              "The name of the Appcanary monitor to update.") do |mn|
+              "The name of the Appcanary monitor to update. Required.") do |mn|
+        vals[:monitor_name] = mn
         Appcanary.monitor_name = mn
       end
     end
 
-    def parse
-      top_level_help = <<-HELP
-Subcommands are:
-  check  -  Check your gem bundle for vulnerabilities
-  update -  Update an Appcanary monitor
-
-See "appcanary COMMAND --help" for more information about a specific command.
-      HELP
-
-      common = OptionParser.new do |opts|
-        opts.banner = "Usage: appcanary check|update [options]"
-        opts.separator ""
-        opts.separator top_level_help
+    def print_help(banner, msg=nil)
+      if msg
+        puts "#{msg}\n\n"
       end
 
+      puts banner
+      exit
+    end
+
+    def parse(args)
+      command = args.first
+      values = {}
+     
       subcommands = {
         "update" => OptionParser.new do |opts|
           opts.banner = "Usage: update [options]"
-          api_key_opt(opts)
-          base_uri_opt(opts)
-          gemfile_lock_opt(opts)
-          monitor_name_opt(opts)
+          api_key_opt(opts, values)
+          base_uri_opt(opts, values)
+          gemfile_lock_opt(opts, values)
+          monitor_name_opt(opts, values)
         end,
         "check" => OptionParser.new do |opts|
           opts.banner = "Usage: check [options]"
-          api_key_opt(opts)
-          base_uri_opt(opts)
-          gemfile_lock_opt(opts)
+          api_key_opt(opts, values)
+          base_uri_opt(opts, values)
+          gemfile_lock_opt(opts, values)
         end
       }
 
-      common.order!
-
-      command = ARGV.shift
       if command.nil?
-        puts "No subcommand found -- try appcanary --help"
-      else
-        subcommands[command].order!
+        print_help TOP_LEVEL_HELP
+      elsif subcommands[command].nil?
+        print_help TOP_LEVEL_HELP, 
+          "Sorry, I don't know '#{command}'."
+      else 
+        subcmd = subcommands[command]
+
+        begin
+          opt = subcmd.parse(args[1..-1])
+        rescue => e
+          print_help subcmd.help, e
+        end
+
+        if values.empty?
+          print_help subcmd.help
+        elsif missing = REQUIRED[command].find { |flag| !values.keys.include?(flag) }
+          print_help subcmd.help, REQUIRED_PARAMS[missing]
+        end
       end
 
       command
@@ -91,9 +123,9 @@ def run_check
 end
 
 def run_appcanary_command
-  case AppcanaryCLI.parse
+  case AppcanaryCLI.parse(ARGV)
   when "update"
-    Appcanary.update_monitor!
+    puts Appcanary.update_monitor!
   when "check"
     run_check
   end

data/lib/appcanary/http.rb

@@ -3,6 +3,8 @@ require "net/http/post/multipart"
 require "json"
 
 module Appcanary
+  require 'securerandom'
+
   class ServiceError < RuntimeError
   end
 

data/lib/appcanary/version.rb

@@ -1,3 +1,3 @@
 module Appcanary
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appcanary
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - J Irving
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-06 00:00:00.000000000 Z
+date: 2017-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multipart-post
@@ -139,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Check your dependencies against Appcanary's database.