akamai_ccu 1.5.3 → 1.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef3e0fed8df1e3850924b49115112c43960ca51c
-  data.tar.gz: 32f31aed414f4e0adede30a7da468d22a2b36de6
+  metadata.gz: 590edfc04540966643fb8dcb26d61b1bc1fd472d
+  data.tar.gz: 786b909ccd366835593fd460dc590d6d2d2b6edd
 SHA512:
-  metadata.gz: 7413b4ad784481a2dea0fe33abeb5beb72ab1ea299545d5213a784f3f81f14d2c009548338216ed80e3a0a4694e867ed7fcf97dfcf70ea7c93aec8bbfe5a87e8
-  data.tar.gz: 79656ea6a16a49e45102814b4c9fa4beb9cdec5b0f8d37ad52c4b6ea6e668849d89dfae727284bad85659ef25f41689c199f8e7e3f9fb8231eb2f7beb9bb2637
+  metadata.gz: 7e08562da9ceb7f72beb90ed9bd38fdae72b23088f28f3c7c47ce964f1dbc5940b85f61d9a805e4632c365fe5529cd202c8e154b3648e5bbe76f04ce7b21543d
+  data.tar.gz: 27796fd0c26becf2f80a1bfdeba91b5d3b5b8586da1248576e24c3854e9462150234029683a5e66c86ce36faae9e26598612fcd96c512aec20d8d10f90b45e83

data/lib/akamai_ccu/cli.rb

@@ -18,13 +18,13 @@ module AkamaiCCU
       @wrapper_klass = wrapper_klass
       @secret_klass = secret_klass
       @endpoint_klass = endpoint_klass
+      @secret = File.expand_path("~/.edgerc")
       @network = Endpoint::Network::STAGING
     end
 
     def call
       parser.parse!(@args)
       return @logger.warn("specify contents to purge by bulk, CP codes or urls") if Array(@objects).empty?
-      return @logger.warn("specify path to the secret file either by edgerc or by txt") unless @secret
       return @logger.warn("specified secret file does not exist") unless File.exist?(@secret)
       @wrapper_klass.setup(@secret_klass.by_file(@secret), Client, @logger)
       wrapper = @wrapper_klass.new(endpoint: endpoint, headers: Array(@headers))
@@ -51,7 +51,7 @@ module AkamaiCCU
       OptionParser.new do |opts|
         opts.banner = "Usage: ccu_#{@action} --secret=~/.edgerc --production --cp=12345,98765"
 
-        opts.on("-sSECRET", "--secret=SECRET", "Load secret data by file") do |secret|
+        opts.on("-sSECRET", "--secret=SECRET", "Load secret by file (default to ~/.edgerc)") do |secret|
           @secret = File.expand_path(secret)
         end
 
@@ -67,7 +67,7 @@ module AkamaiCCU
           @objects = bulk_objects(File.expand_path(bulk))
         end
 
-        opts.on("--headers=HEADERS", "Specify HTTP headers to sign") do |headers|
+        opts.on("--headers=HEADERS", "Specify any HTTP headers to sign") do |headers|
           @headers = headers.split(",").map(&:strip)
         end
 

data/lib/akamai_ccu/secret.rb

@@ -9,19 +9,17 @@ module AkamaiCCU
 
     class FileContentError < ArgumentError; end
 
-    class << self
-      def by_file(name = "~/.edgerc", time = Time.now)
-        path = File.expand_path(name)
-        return unless File.exist?(path)
-        opts = File.readlines(path).reduce({}) do |acc, entry|
-          _, k, v = Array(entry.match(ENTRY_REGEX))
-          acc[k] = v if k && v
-          acc
-        end
-        new(client_secret: opts.fetch("client_secret"), host: opts.fetch("host"), access_token: opts.fetch("access_token"), client_token: opts.fetch("client_token"), max_body: opts.fetch("max-body", BODY_SIZE), time: time)
-      rescue KeyError => e
-        raise FileContentError, "bad file content, #{e.message}", e.backtrace
+    def self.by_file(name = "~/.edgerc", time = Time.now)
+      path = File.expand_path(name)
+      return unless File.exist?(path)
+      opts = File.readlines(path).reduce({}) do |acc, entry|
+        _, k, v = Array(entry.match(ENTRY_REGEX))
+        acc[k] = v if k && v
+        acc
       end
+      new(client_secret: opts.fetch("client_secret"), host: opts.fetch("host"), access_token: opts.fetch("access_token"), client_token: opts.fetch("client_token"), max_body: opts.fetch("max-body", BODY_SIZE), time: time)
+    rescue KeyError => e
+      raise FileContentError, "bad file content, #{e.message}", e.backtrace
     end
 
     attr_reader :host, :max_body, :nonce, :timestamp

data/lib/akamai_ccu/version.rb

@@ -1,3 +1,3 @@
 module AkamaiCCU
-  VERSION = "1.5.3"
+  VERSION = "1.5.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: akamai_ccu
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.5.4
 platform: ruby
 authors:
 - costajob