opskeleton 0.8.6 → 0.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef00dd6fb0ac41b70615e21f299a397bc40b8c57
-  data.tar.gz: 09b41ae8257525772adef606cdcc2c6f958f5e9b
+  metadata.gz: 5a7ab747c40fdb17d278bf754f80d77eee667da8
+  data.tar.gz: 5c55804fe475b30bb28ffc0e1b630461e1b47400
 SHA512:
-  metadata.gz: f5d34e874e9bf99ffc5e576ba0bf686061681aa4e37a15e70aff3e864549c7b6e15b688be8316bc0beec8fa25bbc49c231a2e5dc11c9dabead7818f0d00843b3
-  data.tar.gz: d7dc02c32054516d94de2180f97093b003c9859ca4ea348380ed36352e9cf60511ce6cf7a41bc5d63458555f6d64f5a0774a53fde81649d88d791cbf4b95d04e
+  metadata.gz: a28a029f8e5a7a2a32567ed4c9a2ebac54fcdfac2e34fe3b413bb0e86b75f0930f9d6d8b2fd40d04a2232c951589e8cadfa9e52f4fc2dafb1cd4fcee56a40bf6
+  data.tar.gz: 6a93fbcb3984ad46ce746d3ad033c050e58169d68404995dcda6391a7ade98980411fda117f1374eafb033c03ff4e43e8149d8a654174bf8b5f4d7d50f4a38f4

data/Gemfile.lock

@@ -1,106 +1,179 @@
 PATH
   remote: .
   specs:
-    opskeleton (0.8.6)
+    opskeleton (0.8.7)
       bintray_deploy
       thor
 
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (2.2.7)
+    CFPropertyList (2.2.8)
+    aws-sdk (2.0.38)
+      aws-sdk-resources (= 2.0.38)
+    aws-sdk-core (2.0.38)
+      builder (~> 3.0)
+      jmespath (~> 1.0)
+      multi_json (~> 1.0)
+    aws-sdk-resources (2.0.38)
+      aws-sdk-core (= 2.0.38)
     bintray_deploy (0.0.4)
       configuration
       rest-client
       thor
-    chef (11.6.2)
+    builder (3.2.2)
+    chef (12.2.1)
+      chef-zero (~> 4.0)
+      diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
+      ffi-yajl (>= 1.2, < 3.0)
       highline (~> 1.6, >= 1.6.9)
-      json (>= 1.4.4, <= 1.7.7)
       mixlib-authentication (~> 1.3)
-      mixlib-cli (~> 1.3)
-      mixlib-config (~> 1.1, >= 1.1.2)
+      mixlib-cli (~> 1.4)
+      mixlib-config (~> 2.0)
       mixlib-log (~> 1.3)
-      mixlib-shellout (~> 1.1)
+      mixlib-shellout (>= 2.0.0.rc.0, < 3.0)
       net-ssh (~> 2.6)
-      net-ssh-multi (~> 1.1.0)
-      ohai (>= 0.6.0, < 7.0.0)
-      rest-client (>= 1.0.4, < 1.7.0)
-      yajl-ruby (~> 1.1)
+      net-ssh-multi (~> 1.1)
+      ohai (~> 8.0)
+      plist (~> 3.1.0)
+      pry (~> 0.9)
+      rspec-core (~> 3.2)
+      rspec-expectations (~> 3.2)
+      rspec-mocks (~> 3.2)
+      rspec_junit_formatter (~> 0.2.0)
+      serverspec (~> 2.7)
+      specinfra (~> 2.10)
+    chef-zero (4.2.1)
+      ffi-yajl (>= 1.1, < 3.0)
+      hashie (~> 2.0)
+      mixlib-log (~> 1.3)
+      rack
+      uuidtools (~> 2.1)
     coderay (1.1.0)
     configuration (1.3.4)
     diff-lcs (1.2.5)
+    domain_name (0.5.23)
+      unf (>= 0.0.5, < 1.0.0)
     erubis (2.7.0)
-    facter (2.0.1)
+    facter (2.4.3)
       CFPropertyList (~> 2.2.6)
-    hiera (1.3.2)
+    ffi (1.9.8)
+    ffi-yajl (2.0.0)
+      ffi (~> 1.5)
+      libyajl2 (~> 1.2)
+    hashie (2.1.2)
+    hiera (1.3.4)
       json_pure
-    highline (1.6.21)
+    highline (1.7.1)
+    http-cookie (1.0.2)
+      domain_name (~> 0.5)
     ipaddress (0.8.0)
-    json (1.7.7)
-    json_pure (1.8.1)
+    jmespath (1.0.2)
+      multi_json (~> 1.0)
+    json_pure (1.8.2)
+    libyajl2 (1.2.0)
     metaclass (0.0.4)
     method_source (0.8.2)
-    mime-types (2.2)
+    mime-types (2.4.3)
     mixlib-authentication (1.3.0)
       mixlib-log
     mixlib-cli (1.5.0)
-    mixlib-config (1.1.2)
+    mixlib-config (2.1.0)
     mixlib-log (1.6.0)
-    mixlib-shellout (1.4.0)
-    mocha (1.0.0)
+    mixlib-shellout (2.0.1)
+    mocha (1.1.0)
       metaclass (~> 0.0.1)
-    net-ssh (2.9.1)
+    multi_json (1.11.0)
+    net-scp (1.2.1)
+      net-ssh (>= 2.6.5)
+    net-ssh (2.9.2)
     net-ssh-gateway (1.2.0)
       net-ssh (>= 2.6.5)
-    net-ssh-multi (1.1)
-      net-ssh (>= 2.1.4)
-      net-ssh-gateway (>= 0.99.0)
-    ohai (6.22.0)
+    net-ssh-multi (1.2.1)
+      net-ssh (>= 2.6.5)
+      net-ssh-gateway (>= 1.2.0)
+    netrc (0.10.3)
+    ohai (8.2.0)
+      ffi (~> 1.9)
+      ffi-yajl (>= 1.1, < 3.0)
       ipaddress
+      mime-types (~> 2.0)
       mixlib-cli
-      mixlib-config
+      mixlib-config (~> 2.0)
       mixlib-log
-      mixlib-shellout
-      systemu (~> 2.5.2)
-      yajl-ruby
-    pry (0.9.12.6)
-      coderay (~> 1.0)
-      method_source (~> 0.8)
+      mixlib-shellout (~> 2.0)
+      rake (~> 10.1)
+      systemu (~> 2.6.4)
+      wmi-lite (~> 1.0)
+    plist (3.1.0)
+    pry (0.10.1)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
       slop (~> 3.4)
-    puppet (3.5.1)
+    puppet (3.7.5)
       facter (> 1.6, < 3)
       hiera (~> 1.0)
       json_pure
-      rgen (~> 0.6.5)
-    puppetlabs_spec_helper (0.4.1)
-      mocha (>= 0.10.5)
+    puppet-lint (1.1.0)
+    puppet-syntax (2.0.0)
+      rake
+    puppetlabs_spec_helper (0.10.1)
+      mocha
+      puppet-lint
+      puppet-syntax
       rake
-      rspec (>= 2.9.0)
-      rspec-puppet (>= 0.1.1)
-    rake (10.3.1)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
-    rgen (0.6.6)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.8)
-    rspec-expectations (2.14.5)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.6)
-    rspec-puppet (1.0.1)
+      rspec-puppet
+    rack (1.6.0)
+    rake (10.4.2)
+    rest-client (1.8.0)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 3.0)
+      netrc (~> 0.7)
+    rspec (3.2.0)
+      rspec-core (~> 3.2.0)
+      rspec-expectations (~> 3.2.0)
+      rspec-mocks (~> 3.2.0)
+    rspec-core (3.2.3)
+      rspec-support (~> 3.2.0)
+    rspec-expectations (3.2.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
+    rspec-its (1.2.0)
+      rspec-core (>= 3.0.0)
+      rspec-expectations (>= 3.0.0)
+    rspec-mocks (3.2.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
+    rspec-puppet (2.0.1)
       rspec
-    slop (3.5.0)
-    systemu (2.5.2)
+    rspec-support (3.2.2)
+    rspec_junit_formatter (0.2.0)
+      builder (< 4)
+      rspec (>= 2, < 4)
+      rspec-core (!= 2.12.0)
+    serverspec (2.14.1)
+      multi_json
+      rspec (~> 3.0)
+      rspec-its
+      specinfra (~> 2.25)
+    slop (3.6.0)
+    specinfra (2.28.1)
+      net-scp
+      net-ssh
+    systemu (2.6.5)
     thor (0.19.1)
-    yajl-ruby (1.2.1)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.6)
+    uuidtools (2.1.5)
+    wmi-lite (1.0.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  aws-sdk (~> 2)
   chef
   opskeleton!
   pry

data/RELEASE-NOTES.md

@@ -1,4 +1,12 @@
-# Celestial 0.6.0 (06/08/14):
+# Opskeleton 0.8.7 (13/04/15):
+
+## Fixes:
+
+## New Features:
+
+* Supporting s3 upload.
+
+# Opskeleton 0.6.0 (06/08/14):
 
 ## Fixes:
 * Changing opsk yml extension to yaml (matching proper extension name).

data/bin/opsk

@@ -22,7 +22,8 @@ module Opsk
     register Opsk::Dockerize, 'dockerize', 'dockerize [from] [os_type]', 'Creates a docker image from the current sandbox'
     register Opsk::Clean, 'clean', 'clean', 'cleans up packaging products'
     register Opsk::Bump, 'bump', 'bump', 'bumps up version (clearing old version also)'
-    register Opsk::Deploy, 'deploy', 'deploy [bintray repo]', 'deploy packge into bintray.com'
+    register Opsk::DeployBintray, 'deploy_bintray', 'deploy_bintray [repo]', 'deploy packge into bintray.com'
+    register Opsk::DeployS3, 'deploy_s3', 'deploy_s3 [bucket] [path]', 'deploy packge into s3 bucket under path folder'
 
     desc 'version', 'print opsk version'  
     def version

data/chef.md

@@ -101,15 +101,7 @@ $ sudo ./run.sh dev
 
 ## Deployment
 
-The packaged tar files can be consumed using any tool and protocol however http is recommended, opsk has built in support for deploying public sandboxes into bintray:
-
-```bash 
-$ opsk package
-$ opsk deploy <bintray-repo>
-deployed foo-sandbox-0.0.1.tar.gz to http://dl.bintray.com/narkisr/<bintray-repo>/foo-sandbox-0.0.1.tar.gz
-```
-
-Make sure to  [configure](https://github.com/narkisr/bintray-deploy#usage) configure the bintray API key.
+ See [deploy](deploy.md)
 
 ## Updating
 

data/deploy.md

@@ -0,0 +1,33 @@
+# Deployment
+
+The packaged tar files can be consumed using any tool and protocol (http, s3 etc),  opsk has built in support for deploying public sandboxes into:
+
+* Bintray Make sure to  [configure](https://github.com/narkisr/bintray-deploy#usage) configure the bintray API key:
+
+  ```bash 
+   $ opsk package
+   $ opsk deploy_bintray <bintray-repo>
+     deployed foo-sandbox-0.0.1.tar.gz to http://dl.bintray.com/narkisr/<bintray-repo>/foo-sandbox-0.0.1.tar.gz
+```
+
+
+* S3:
+
+  ```bash 
+   $ opsk package
+   $ opsk deploy_s3 <bucket> <path>
+     deployed foo-sandbox-0.0.1.tar.gz to opsk-boxes/foo/foo-sandbox-0.0.1.tar.gz
+  ```
+ Make sure to configure s3 section under ~/.configuration.rb:
+
+ ```ruby
+  Configuration.for('s3') {
+    access_key ''
+    secret_key ''
+    region ''
+  }
+ ```
+
+
+
+

data/lib/opskeleton/{deploy.rb → deploy_bintray.rb}

@@ -1,6 +1,6 @@
 
 module  Opsk
-  class Deploy < Thor::Group
+  class DeployBintray < Thor::Group
     include Thorable, Thor::Actions
 
     argument :repo, :type => :string, :desc => 'bintray repo'

data/lib/opskeleton/deploy_s3.rb

@@ -0,0 +1,47 @@
+
+require 'configuration'
+conf = "#{ENV['HOME']}/.configuration.rb"
+raise "#{conf} not found, please create a conf file with a s3 section" unless File.exists?(conf)
+require conf
+
+module  Opsk
+  class DeployS3 < Thor::Group
+    include Thorable, Thor::Actions
+
+    argument :bucket, :type => :string, :desc => 'bucket'
+    argument :path, :type => :string, :desc => 'path'
+
+    desc 'Deploy sandbox into an s3 bucket' 
+
+    def validate
+	check_root
+    end
+
+
+    def upload
+	require 'aws-sdk'
+	pkg = Opsk::Package.new
+	tar =  "#{pkg.artifact_path}.tar.gz"
+	base = File.basename(tar)
+	if(File.exists?(tar))
+	  begin
+	    conf = Configuration.for 's3'
+	    Aws.config.update({
+		region: conf.region,
+		credentials: Aws::Credentials.new(conf.access_key, conf.secret_key),
+	    })
+	    s3 = Aws::S3::Resource.new
+	    s3.bucket(bucket).object("#{path}/#{base}").upload_file(tar)
+	    say("deployed #{base} to #{bucket}/#{path}/#{base}")
+	  rescue Exception => e
+	    say("failed to deploy due to #{e}")
+	  end
+	else
+	  say('package is missing please run opsk package first')
+	end
+    end
+
+  end
+
+end
+

data/lib/opskeleton/version.rb

@@ -1,3 +1,3 @@
 module Opskeleton
-  VERSION = '0.8.6'
+  VERSION = '0.8.7'
 end

data/lib/opskeleton.rb

@@ -10,6 +10,7 @@ require 'opskeleton/clean'
 require 'opskeleton/bump'
 require 'opskeleton/generate_puppet'
 require 'opskeleton/generate_chef'
-require 'opskeleton/deploy'
+require 'opskeleton/deploy_bintray'
+require 'opskeleton/deploy_s3'
 require 'opskeleton/module'
 

data/opskeleton.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency('chef')
   gem.add_development_dependency('rspec-puppet')
   gem.add_development_dependency('puppetlabs_spec_helper', '>= 0.1.0')
+  gem.add_development_dependency('aws-sdk', '~> 2')
   gem.add_development_dependency('pry')
 
   gem.files         = `git ls-files`.split($/)

data/puppet.md

@@ -94,15 +94,7 @@ An external node classifier based runner is also available under scripts/run.sh,
 
 ## Deployment
 
-The packaged tar files can be consumed using any tool and protocol however http is recommended, opsk has built in support for deploying public sandboxes into bintray:
-
-```bash 
-$ opsk package
-$ opsk deploy <bintray-repo>
-deployed foo-sandbox-0.0.1.tar.gz to http://dl.bintray.com/narkisr/<bintray-repo>/foo-sandbox-0.0.1.tar.gz
-```
-
-Make sure to  [configure](https://github.com/narkisr/bintray-deploy#usage) configure the bintray API key.
+ See [deploy](deploy.md)
 
 ## Updating
 Keeping you box up to date with latest opsk version is easy, just re-generate it again and resolve conflicts by answering y/n:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opskeleton
 version: !ruby/object:Gem::Version
-  version: 0.8.6
+  version: 0.8.7
 platform: ruby
 authors:
 - narkisr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-12 00:00:00.000000000 Z
+date: 2015-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.0
+- !ruby/object:Gem::Dependency
+  name: aws-sdk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -131,6 +145,7 @@ files:
 - autocomplete/opsk_bash_completion
 - bin/opsk
 - chef.md
+- deploy.md
 - img/chef-cycle.png
 - img/chef-layout.png
 - img/puppet-cycle.png
@@ -138,7 +153,8 @@ files:
 - lib/opskeleton.rb
 - lib/opskeleton/bump.rb
 - lib/opskeleton/clean.rb
-- lib/opskeleton/deploy.rb
+- lib/opskeleton/deploy_bintray.rb
+- lib/opskeleton/deploy_s3.rb
 - lib/opskeleton/dockerize.rb
 - lib/opskeleton/generate_chef.rb
 - lib/opskeleton/generate_puppet.rb