knife-s3 0.0.1 → 0.0.2

data/lib/chef/knife/s3_base.rb

@@ -12,7 +12,7 @@
 # limitations under the License.
 #
 
-# s3_base.rb based on cfn_base.rb by Neil Turner, which can be found at https://github.com/neillturner/knife-cfn
+# s3_base.rb based on cfn_base.rb by Neill Turner, which can be found at https://github.com/neillturner/knife-cfn
 
 require 'chef/knife'
 
@@ -43,8 +43,9 @@ class Chef
           option :region,
             :long => "--region REGION",
             :description => "Your AWS region",
-            :default => "us-west-1",
+            :default => "us-east-1",
             :proc => Proc.new { |key| Chef::Config[:knife][:region] = key }
+
         end
       end
       def connection

data/lib/chef/knife/s3_download.rb

@@ -0,0 +1,75 @@
+require 'chef/knife'
+require 'chef/knife/s3_base'
+
+class Chef
+  class Knife
+    class S3Download < Chef::Knife::S3Base
+
+      deps do
+        require 'fog'
+        require 'readline'
+        require 'chef/json_compat'
+        require 'chef/knife/bootstrap'
+        Chef::Knife::Bootstrap.load_deps
+      end
+
+      banner "knife s3 download -b <bucket_name> -r REMOTE_FILE [-f FILE]"
+
+      option :bucket,
+          :short  => "-b BUCKET",
+          :long   => "--bucket BUCKET",
+          :description => "Specify the S3 bucket"
+
+      option :pathname,
+        :short    => "-r REMOTE_FILE",
+        :long     => "--remote REMOTE_FILE",
+        :description => "Specify the remote path (and filename) to download."
+
+      option :localfile,
+          :short  => "-f FILE",
+          :long   => "--file FILE",
+          :description  => "The local file to write to. Defaults to the remote filename."
+
+      option :overwrite,
+          :short  => "-o",
+          :long   => "--overwrite",
+          :description  => "Forces the local file to be overwritten if it exists."
+
+      def run
+        $stdout.sync = true
+
+        validate!
+
+        if config[:bucket].nil?
+          puts "No bucket specified"
+          exit 1
+        end
+
+        if config[:pathname].nil?
+          puts "No path specified"
+          exit 1
+        end
+
+        if config[:localfile].nil?
+          config[:localfile] = config[:pathname] #TODO: should strip "directory" elements from the path?
+        end
+
+        if File.exists?(config[:localfile]) and config[:overwrite].nil?
+          print config[:localfile] + " exists. Overwrite (y/n)? "
+          ans=$stdin.gets
+          if !ans.match(/^y/i)
+            puts "Not overwriting, exiting"
+            exit 0
+          end
+        end
+
+        begin
+          remote_file = connection.directories.get(config[:bucket]).files.get(config[:pathname])
+          local_file = File.open(config[:localfile],'w')
+          local_file.write(remote_file.body)
+        end
+
+      end
+    end
+  end
+end

data/lib/chef/knife/s3_list.rb

@@ -13,12 +13,12 @@ class Chef
         Chef::Knife::Bootstrap.load_deps
       end
 
-      banner "knife s3 list <bucket name>"
+      banner "knife s3 list -b <bucket name> [-p <prefix>]"
 
-      option :bucket_name,
-          :short => "-b BUCKET",
-          :long => "--bucket BUCKET",
-          :description => "Sets bucket name"
+      option :bucket,
+          :short  => "-b BUCKET",
+          :long   => "--bucket BUCKET",
+          :description => "Specify the S3 bucket"
 
       option :prefix,
           :short  => "-p PREFIX",
@@ -30,24 +30,24 @@ class Chef
 
         validate!
 
-        if config[:bucket_name]
-          puts "Listing bucket " + config[:bucket_name]
+        if config[:bucket]
+          puts "Listing bucket " + config[:bucket]
         else
-          puts "Please supply a bucket name"
+          puts "No bucket specified"
           exit 1
         end
 
         if config[:prefix]
-          puts "Filtering by prefix " + config[:prefix]
+          puts "Listing with prefix " + config[:prefix]
         end
 
         begin
           if config[:prefix].nil?
-            connection.directories.get(config[:bucket_name]).files.map do |file|
+            connection.directories.get(config[:bucket]).files.map do |file|
               puts file.key
             end
           else
-            connection.directories.get(config[:bucket_name], prefix: config[:prefix]).files.map do |file|
+            connection.directories.get(config[:bucket], prefix: config[:prefix]).files.map do |file|
               puts file.key
             end
           end

data/lib/chef/knife/s3_upload.rb

@@ -0,0 +1,80 @@
+require 'chef/knife'
+require 'chef/knife/s3_base'
+
+class Chef
+  class Knife
+    class S3Upload < Chef::Knife::S3Base
+
+      deps do
+        require 'fog'
+        require 'readline'
+        require 'chef/json_compat'
+        require 'chef/knife/bootstrap'
+        Chef::Knife::Bootstrap.load_deps
+      end
+
+      banner "knife s3 upload -b <bucket_name> -f <FILE> [-r REMOTE_FILE]"
+
+      option :bucket,
+          :short  => "-b BUCKET",
+          :long   => "--bucket BUCKET",
+          :description => "Specify the S3 bucket"
+
+      option :pathname,
+        :short    => "-r REMOTE_FILE",
+        :long     => "--remote REMOTE_FILE",
+        :description => "Remote path (and filename) to upload to."
+
+      option :localfile,
+          :short  => "-f FILE",
+          :long   => "--file FILE",
+          :description  => "The local file to upload."
+
+      option :is_public,
+          :short  => "-p",
+          :long   => "--public",
+          :description => "If set, then the file will be set with public read access."
+
+      def run
+        $stdout.sync = true
+
+        validate!
+
+        public = false
+
+        if config[:bucket].nil?
+          puts "No bucket specified"
+          exit 1
+        end
+
+        if config[:localfile].nil?
+          puts "No file specified"
+          exit 1
+        end
+
+        if !File.exists?(config[:localfile])
+          puts "file '" + config[:localfile] + "' does not exist"
+          exit 1
+        end
+
+        if config[:pathname].nil?
+          puts "No remote path specified. Uploading as " + config[:localfile]
+          config[:pathname] = config[:localfile]
+        end
+
+        if !config[:is_public].nil?
+          public = true
+        end
+
+        begin
+          remote_file = connection.directories.get(config[:bucket]).files.create(
+              :key  => config[:pathname],
+              :body => File.open(config[:localfile]),
+              :public => public
+          )
+        end
+
+      end
+    end
+  end
+end

data/lib/knife-s3/version.rb

@@ -1,3 +1,3 @@
 module KnifeS3
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-s3
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -50,7 +50,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/chef/knife/s3_list.rb
+- lib/chef/knife/s3_download.rb
 - lib/chef/knife/s3_base.rb
+- lib/chef/knife/s3_upload.rb
 - lib/knife-s3/version.rb
 homepage: https://github.com/brettcave/knife-s3
 licenses: []