akamai_ccu 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59bb2a82f3a775533b7efd02a019444caddefb90
-  data.tar.gz: 9f1bd419f021dae8f3112d8a088aaeac6554a395
+  metadata.gz: 20f56b91f406cdd333d1c23d885c7370658fc906
+  data.tar.gz: 3887d4f39e9a4b3e7a14e47f2df6ac1aea47aff5
 SHA512:
-  metadata.gz: 9b44d3a5cdbba02da05b2f942d0e66b14066428af90e82089af540656455cad09932ea8c1714c79ab90cee34296936696166459f0dab5d136f2d9bd62a7eb325
-  data.tar.gz: e59750ba6ab033ed37c1b7521de7d44b8d1ffd6383830799a676c40e3183c1f10b95f6330122f47c0192472ab508019c8b243ce18cd0f100f839b9f84e471b45
+  metadata.gz: 9590ad88f2e5426399d9049d5f60852ec7212b163e99da0c177ff3a9cb9b4ac3450a33004adb4571a6d9ae701da10f4ed8aa549d2163162669a7b02e97ee8aa3
+  data.tar.gz: '0403824dafb5fecb2f3d3cb8dfbf07c2b8b1f15399b99bf3591475f5f99b64c3e933e5938a1639548f223550203eaa041f185d6314928782804a2f5dd4a57d21'

data/README.md

@@ -17,6 +17,8 @@
     * [Help](#help)
     * [ccu_invalidate](#ccu_invalidate)
     * [ccu_delete](#ccu_delete)
+    * [Bulk operation](#bulk-operation)
+    * [Redirecting output](#redirecting-output)
     * [Overwriting options](#overwriting-options)
   * [Possible issues](#possible-issues)
 
@@ -163,7 +165,7 @@ Usage: invalidate --edgerc=./.edgerc --production --cp="12345, 98765"
 You can request for contents invalidation by calling:
 ```shell
 ccu_invalidate --edgerc=~/.edgerc \ 
-               --url="https://akaa-baseurl-xxx-xxx.luna.akamaiapis.net/*.css,https://akaa-baseurl-xxx-xxx.luna.akamaiapis.net/*.js" \
+               --url=https://akaa-baseurl-xxx-xxx.luna.akamaiapis.net/*.css,https://akaa-baseurl-xxx-xxx.luna.akamaiapis.net/*.js \
                --production
 ```
 
@@ -175,6 +177,31 @@ ccu_delete --txt=~/tokens.txt \
            --headers=Accept,Content-Length
 ```
 
+#### Bulk operation
+In case you have multiple contents to work with, it could be impractical to write several entries on the CLI.  
+Just specify them on a separate file and use the bulk option:
+
+`urls.txt` file with each url/CP code specified on one line:
+```txt
+https://akaa-baseurl-xxx-xxx.luna.akamaiapis.net/*.css
+https://akaa-baseurl-xxx-xxx.luna.akamaiapis.net/*.js
+https://akaa-baseurl-xxx-xxx.luna.akamaiapis.net/static/*.html
+```
+
+Specify the bulk option by using the file path:
+```shell
+ccu_invalidate --edgerc=~/.edgerc --bulk=urls.txt
+```
+
+##### Do not mix content types
+You cannot specify both CP codes and URLs on the same bulk file, mind being consistent!
+
+#### Redirecting output
+In case you're calling the CLI from another program (like your Jenkins script), just redirect the output to your log file:
+```shell
+ccu_invalidate --edgerc=~/.edgerc --cp=12345,98765 > mylog.log
+```
+
 #### Overwriting options
 The CLI does allow only one option to specify the secret file and the content objects.  
 If multiple options for the same scope are provided, the program runs by giving precedence to:
@@ -189,12 +216,20 @@ ccu_invalidate --txt=~/tokens.txt \
 ```
 
 ##### Content objects
-The `cp` option has always precedence over the `url` one:
+The `bulk` option has always precedence over the `cp` one, that has precedence over the `url`:
+
+This command will invalidate by urls:
 ```shell
-# will invalidate by CP code
 ccu_invalidate --txt=~/tokens.txt \
-               --url="https://akaa-baseurl-xxx-xxx.luna.akamaiapis.net/*.css,https://akaa-baseurl-xxx-xxx.luna.akamaiapis.net/*.js" \
                --cp=12345,98765
+               --bulk=urls.txt
+```
+
+This command will delete by CP codes:
+```shell
+ccu_delete --txt=~/tokens.txt \
+           --cp=12345,98765
+           --url=https://akaa-baseurl-xxx-xxx.luna.akamaiapis.net/*.css,https://akaa-baseurl-xxx-xxx.luna.akamaiapis.net/*.js
 ```
 
 ### Possible Issues

data/lib/akamai_ccu/cli.rb

@@ -1,3 +1,4 @@
+require "logger"
 require "optparse"
 require "akamai_ccu/wrapper"
 
@@ -9,6 +10,7 @@ module AkamaiCCU
       @args = args
       @action = action
       @io = io
+      @logger = Logger.new(io)
       @wrapper_klass = wrapper_klass
       @secret_klass = secret_klass
       @endpoint_klass = endpoint_klass
@@ -17,10 +19,11 @@ module AkamaiCCU
 
     def call
       parser.parse!(@args)
-      return @io.puts(%q{Specify contents to purge either by cp codes or by urls}) unless @objects
-      return @io.puts(%q{Specify path to the secret file either by edgerc or by txt}) unless @secret
+      return @logger.warn("specify contents to purge either by cp codes or by urls") unless @objects
+      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 = @wrapper_klass.new(secret: secret, endpoint: endpoint, headers: Array(@headers))
-      @io.puts wrapper.call(@objects)
+      @logger.info wrapper.call(@objects).to_s
     end
 
     private def secret
@@ -37,16 +40,24 @@ module AkamaiCCU
       Endpoint::Mode::URL
     end
 
+    private def bulk_objects(file)
+      return unless File.exist?(file)
+      File.readlines(file).map(&:strip).reject(&:empty?).map do |entry|
+        entry = entry.to_i unless entry.start_with?("http")
+        entry
+      end
+    end
+
     private def parser
       OptionParser.new do |opts|
         opts.banner = %Q{Usage: #{@action} --edgerc=./.edgerc --production --cp="12345, 98765"}
 
         opts.on("-eEDGERC", "--edgerc=EDGERC", "Load secret by .edgerc file") do |secret|
-          @secret = secret
+          @secret = File.expand_path(secret)
         end
 
         opts.on("-tTXT", "--txt=TXT", "Load secret by TXT file") do |secret|
-          @secret = secret
+          @secret = File.expand_path(secret)
         end
 
         opts.on("-cCP", "--cp=CP", "Specify contents by provider (CP) codes") do |objects|
@@ -57,6 +68,10 @@ module AkamaiCCU
           @objects = objects.split(",").map(&:strip)
         end
 
+        opts.on("-bBULK", "--bulk=BULK", "Specify bulk contents in a file") do |bulk|
+          @objects = bulk_objects(bulk)
+        end
+
         opts.on("--headers=HEADERS", "Specify HTTP headers to sign") do |headers|
           @headers = headers.split(",").map(&:strip)
         end

data/lib/akamai_ccu/version.rb

@@ -1,3 +1,3 @@
 module AkamaiCCU
-  VERSION = "1.2.1"
+  VERSION = "1.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: akamai_ccu
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - costajob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-21 00:00:00.000000000 Z
+date: 2017-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler