cknife 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 942e64f111eae005180fac6810e16a3edf9c3a84
-  data.tar.gz: c4a46d9f451bb18b8799815c48a1be45d1632e49
+  metadata.gz: 7870ad7c8c9c58e3d5b7b74bc2e021d60a87a21a
+  data.tar.gz: 41c4dbed7df35ec62fbfbcdc829e7d4b4dab6965
 SHA512:
-  metadata.gz: dbe3f929fa330740f8928de67be6b45f5ad3f3088538c79a7cd47bf0a88f4dd4492d7bfcdcd6018e86072c08228f6edf94db28c2c9366526bae39294d9dfca34
-  data.tar.gz: 805af5ed73add5a49fc6f10c4ae97bd6f73e6230625d1becb8b33e1b6303758d55d16ed64cb9d382f3e711bb9752bc1ca8a01dedd0d624990bfd896bcde6b7c8
+  metadata.gz: 1ca47285a7655a8720e3b77b6cab4d567dbe69e9264496d88f80fdeaa2d228a864f5ed028aebfb557fb46f29242cc18513856d934ed1a1bbbca187afbd6f4f3c
+  data.tar.gz: 10d540700a6615dce43e2298650227d74425e23dec9ea66d9c15e3e1d70f299041a305031684fd248026f55cb34d7d928abf6b9f4ea6f406192ae9280958dad4

data/LICENSE

@@ -1,6 +1,6 @@
-The MIT License (MIT)
+MIT License
 
-Copyright (c) 2013 The Mike De La Loza Company
+Copyright (c) 2018 Michael Rivera
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -9,13 +9,13 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/README.md

@@ -17,9 +17,11 @@ Install ruby and possibly bundler:
 
 Create a Gemfile with cknife and its git repository.
 
+
     source "http://rubygems.org"
-    
-    gem "cknife", :git => "https://github.com/mikedll/cknife.git"
+    git_source(:github) { |repo| "https://github.com/#{repo}.git" }
+
+    gem "cknife", '~> 1.1.0'
 
 Run bundle.
 
@@ -76,9 +78,10 @@ Setup your AWS key and secret in any of these methods, in order of priority:
   - $CWD/cknife.yml
   - $CWD/tmp/cknife.yml
   - environment variables: `KEY`, `SECRET`
-  - environment variablse: `AMAZON_ACCESS_KEY_ID`, `AMAZON_SECRET_ACCESS_KEY` 
+  - environment variables: `AMAZON_ACCESS_KEY_ID`, `AMAZON_SECRET_ACCESS_KEY` 
 
-The format of your cknife.yml must be like so:
+If using one of the above cknife.yml files to define your keys, the format
+is as follows:
 
     ---
     key: AKIAblahblahb...
@@ -360,13 +363,19 @@ One of the following, like patch. This will create a git commit.
     bundle exec rake version:bump:minor
     bundle exec rake version:bump:patch
 
-Create the gem spec.
+Do a git flow release. Create the gem spec and commit it:
 
     bundle exec rake gemspec:generate
     git commit -am "Generated gemspec for version 0.1.4"
 
-You can `rake release`... I think that deploys
-the gem to Rubygems.
+Do a git flow finish release. Push to github. You can
+then do a release to Rubygems. This command will
+try to generate the gemspec, but nothing will happen
+since the gemspec is already valid.
+
+    rake release
+
+### Building Locally (Optional)
 
 You may build a local gem:
 

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.1.1

data/cknife.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: cknife 1.1.0 ruby lib
+# stub: cknife 1.1.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "cknife".freeze
-  s.version = "1.1.0"
+  s.version = "1.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]

data/lib/cknife/cknife_aws.rb

@@ -71,6 +71,37 @@ class CKnifeAws < Thor
       @cdn ||= Fog::CDN.new(fog_opts)
     end
 
+    def get_bucket(bucket_name)
+      d = fog_storage.directories.select { |d| d.key == bucket_name }.first
+
+      if d.nil?
+        say ("Found no bucket by name #{bucket_name}")
+        return
+      end
+      d
+    end
+
+    def get_file(bucket, file_name)
+      f = bucket.files.select { |f| f.key == file_name }.first
+      if f.nil?
+        say("Found no file in #{bucket.key} having name #{file_name}.")
+        return
+      end
+      f
+    end
+
+    def get_bucket_and_file(bucket_name, file_name)
+      d = get_bucket(bucket_name)
+      return [nil, nil] if d.nil?
+
+      f = get_file(d, file_name)
+      return [nil, nil] if f.nil?
+
+      [d, f]
+    end
+
+
+
     def show_buckets
       fog_storage.directories.sort { |a,b| a.key <=> b.key }.each { |b| puts "#{b.key}" }
     end
@@ -196,15 +227,26 @@ class CKnifeAws < Thor
     show_buckets
   end
 
+  desc "url [BUCKET_NAME] [FILE]", "Generate a temporary (15 minute) URL for a file."
+  method_options :region => "us-east-1"
+  method_options :duration => 15
+  def url(bucket_name, file_name)
+    d, f = get_bucket_and_file(bucket_name, file_name)
+    return if d.nil? || f.nil?
+
+    minutes = options[:duration].to_i
+    expiry = (Time.now + minutes.minutes).to_i
+    url = f.url(expiry, path_style: true)
+    say("URL created.")
+    say(url)
+  end
+
   desc "afew [BUCKET_NAME]", "Show first 5 files in bucket"
   method_options :count => "5"
   method_options :glob => "*"
   def afew(bucket_name)
-    d = fog_storage.directories.select { |d| d.key == bucket_name }.first
-    if d.nil?
-      say ("Found no bucket by name #{bucket_name}")
-      return
-    end
+    d = get_bucket(bucket_name)
+    return if d.nil?
 
     found = n_file_heads(d, options[:glob], options[:count].to_i)
 
@@ -448,18 +490,8 @@ class CKnifeAws < Thor
   method_options :noprompt => false
   method_options :region => "us-east-1"
   def fdelete(bucket_name, file_name)
-    d = fog_storage.directories.select { |d| d.key == bucket_name }.first
-
-    if d.nil?
-      say ("Found no bucket by name #{bucket_name}")
-      return
-    end
-
-    f = d.files.select { |f| f.key == file_name }.first
-    if f.nil?
-      say("Found no file in #{d.key} having name #{file_name}.")
-      return
-    end
+    d, f = get_bucket_and_file(bucket_name, file_name)
+    return if d.nil? || f.nil?
 
     if options[:noprompt] || yes?("Are you sure you want to delete #{f.key} in #{d.key}?", :red)
       f.destroy

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cknife
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Michael Rivera