datapimp 1.0.12 → 1.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04d4793efcb122a4aa130ae1e979303970defb83
-  data.tar.gz: 27044a2f923a7e155ca65d0173db0689f5c45119
+  metadata.gz: f92a9f500550b9bf611651ec9269f1f1022b50aa
+  data.tar.gz: 8513b18bb3c76b1ea20e3eb91d532f8f37976994
 SHA512:
-  metadata.gz: 3d9b7739a5f9988355b4e71b9d0dec7e031d9f1d2f2c36d63d1c0d8e3adc94a5eda99393da65f8c54db5b469c865856d7544be70c4d43cb405571869bc064e28
-  data.tar.gz: 4563f49579ceff3abb34559fc754158e1cf8c4211f949f26a6a0c063f2c992f4d35f92a3771d164281599f4d2b1297b4821897792829d54dc438d29513ced6d8
+  metadata.gz: c59ce1165293766f89ed019f6862e39cfc8097c39efe7e152918b512a88605197b8aaa3dcee138655bb1ba42a6f7610a13b45692f6f2ee56886bb83fba59d0ed
+  data.tar.gz: 761f03f731d979fdae3760884eb5954c8f4b0de1179a71d85bb3577b04abbde1693ee076c6aeda3de1159a68046a73504e816619b4994ee2c20b7a74acd66cf7

data/Rakefile

@@ -2,9 +2,6 @@ Dir[File.join(Dir.pwd, 'tasks', '**', '*.rb')].each { |f| require f }
 Dir[File.join(Dir.pwd, 'tasks', '*.rake')].each { |f| load f }
 
 require "bundler/gem_tasks"
-require 'rspec/core/rake_task'
-
-RSpec::Core::RakeTask.new(:spec)
 
 Distribution.configure do |config|
   config.package_name = 'datapimp'
@@ -18,4 +15,6 @@ Distribution.configure do |config|
   ]
 end
 
-task :default => :spec
+task :default do
+  puts "Sup?"
+end

data/lib/datapimp/cli/create.rb

@@ -5,8 +5,12 @@ command 'create cache invalidations' do |c|
   Datapimp::Cli.accepts_keys_for(c, :amazon)
 
   c.option '--all-html', 'Invalidate all HTML paths in the bucket'
+  c.option '--verbose', 'Print extra information such as exactly what paths get invalidated'
   c.option '--previous-deploy', 'Invalidate all paths from the previous deploy'
-  c.option '--paths PATHS', Array, 'The paths you would like to invalidate'
+  c.option '--paths PATHS', Array, 'List the specific paths you would like to invalidate'
+  c.option '--local-path FOLDER', String, 'Determine which paths to invalidate by looking at the files in this folder'
+  c.option '--ignore-paths PATTERN', String, 'Ignore any paths matching the supplied regex'
+  c.option '--match-paths PATTERN', String, 'Only invalidate paths matching the supplied regex'
 
   c.action do |args, options|
     options.defaults(:paths => [])
@@ -15,7 +19,16 @@ command 'create cache invalidations' do |c|
 
     paths = Array(options.paths)
 
-    if options.all_html
+    if options.local_path
+      local = Pathname(options.local_path)
+
+      paths += Dir[local.join('**/*')].map do |file|
+        file = Pathname(file)
+        "/#{file.relative_path_from(local)}"
+      end
+    end
+
+    if options.local_path.to_s.length == 0 && options.all_html
       html_files = bucket.s3.files.select {|file| file.key.match(/\.html/) }
 
       paths += html_files.map {|file| file.public_url }.map do |url|
@@ -24,19 +37,39 @@ command 'create cache invalidations' do |c|
         index = "/" if index == ""
         [path, index]
       end
+    end
 
+    if options.local_path.to_s.length > 0 && options.all_html
+      paths.select! {|path| path.match(/\.html$/) }
+      paths.map! {|path| [path, path.gsub('/index.html','')] }
       paths.flatten!
+      paths << "/"
     end
 
+    paths.flatten!
+
+    # TODO
+    # Need to pull out paths that were previous deployed.
+    # We can rely on the s3 bucket deploy manifest for this.
     if options.previous_deploy
       items = bucket.deploy_manifest["uploaded"]
       items
     end
 
+    if options.match_paths
+      paths.select! {|path| path.to_s.match(options.ignore_paths) }
+    end
+
+    if options.ignore_paths
+      paths.reject! {|path| path.to_s.match(options.ignore_paths) }
+    end
+
+    paths.reject! {|path| path.length == 0}
+
     if paths.length > 0
       log "Posting invalidations for #{ paths.length } paths"
       Datapimp::Sync.amazon.cdn.post_invalidation(bucket.cloudfront.id, paths)
-      log "Invalidated paths: #{ paths.inspect }"
+      log "\nInvalidated paths: #{ paths.inspect }" if options.verbose
     end
   end
 end
@@ -92,5 +125,6 @@ command 'create cloudfront distribution' do |c|
       distribution.cname = Array(options.domains)
       distribution.save
     end
+
   end
 end

data/lib/datapimp/version.rb

@@ -1,3 +1,3 @@
 module Datapimp
-  VERSION = "1.0.12"
+  VERSION = "1.0.13"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datapimp
 version: !ruby/object:Gem::Version
-  version: 1.0.12
+  version: 1.0.13
 platform: ruby
 authors:
 - Jonathan Soeder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-30 00:00:00.000000000 Z
+date: 2015-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -444,7 +444,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A collection of API development patterns that I have accumulated in my career