opskeleton 0.8.10 → 0.8.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11f82b361bb97d7f9abff3dee8e09ac3530b0da3
-  data.tar.gz: 6331db06e138b00e8bbdf5a2a821e98f78ce89ae
+  metadata.gz: 11548126aa84871418a9513bb4c90ae0f0146b6c
+  data.tar.gz: 20146f961bae6ace97a35df98b63a601f6778c3d
 SHA512:
-  metadata.gz: 7b8ff87846c90ff1f2e94fc573635054f44cfa71210008c32a63f8af476d99ed3997f47bf2392409e043076ac28f99a29211494d470711158c6406599fbbc501
-  data.tar.gz: d22049c78fbf07a26c0287f88426ffca48a3a620f003f8fbce96c0b0214062ff4b835a951fbf4c28801369de1e2a5fb602f46d0674cacbf06b23ed3bc6331a6c
+  metadata.gz: 6295c1b5e683c504bf703925e8c96ba282404e7ebbfece824e1a17b276182789e14998b88c53b9cda2490f656a4e457d232cc4886b42709f86a3bab77b9ed8da
+  data.tar.gz: 595e4de6a3cb247b2af1abb78ddf76fda808430f86cb5a8d98432f90694397d01e99a71b85fe22eaef78a75a2ce8174090b979b82689322a956ab3dc31b421f2

data/CHANGES.md

@@ -1,3 +1,11 @@
+# Changes to opskeleton in version 0.8.11
+
+exit 1 when package is missing on different deploy options.
+
+# Changes to opskeleton in version 0.8.10 
+
+Skip destroy fix in spec template.
+
 # Changes to opskeleton in version 0.8.9
 
 Scp custom port support.

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    opskeleton (0.8.9)
+    opskeleton (0.8.11)
       aws-sdk (~> 2)
       bintray_deploy
+      git
       net-scp
       thor
 
@@ -11,28 +12,35 @@ GEM
   remote: https://rubygems.org/
   specs:
     CFPropertyList (2.2.8)
-    aws-sdk (2.0.39)
-      aws-sdk-resources (= 2.0.39)
-    aws-sdk-core (2.0.39)
-      builder (~> 3.0)
+    activemodel (4.2.3)
+      activesupport (= 4.2.3)
+      builder (~> 3.1)
+    activesupport (4.2.3)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    aws-sdk (2.1.2)
+      aws-sdk-resources (= 2.1.2)
+    aws-sdk-core (2.1.2)
       jmespath (~> 1.0)
-      multi_json (~> 1.0)
-    aws-sdk-resources (2.0.39)
-      aws-sdk-core (= 2.0.39)
+    aws-sdk-resources (2.1.2)
+      aws-sdk-core (= 2.1.2)
     bintray_deploy (0.0.4)
       configuration
       rest-client
       thor
     builder (3.2.2)
-    chef (12.2.1)
-      chef-zero (~> 4.0)
+    chef (12.4.0)
+      chef-config (= 12.4.0)
+      chef-zero (~> 4.2, >= 4.2.2)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
-      ffi-yajl (>= 1.2, < 3.0)
+      ffi-yajl (~> 2.2)
       highline (~> 1.6, >= 1.6.9)
       mixlib-authentication (~> 1.3)
       mixlib-cli (~> 1.4)
-      mixlib-config (~> 2.0)
       mixlib-log (~> 1.3)
       mixlib-shellout (>= 2.0.0.rc.0, < 3.0)
       net-ssh (~> 2.6)
@@ -46,7 +54,11 @@ GEM
       rspec_junit_formatter (~> 0.2.0)
       serverspec (~> 2.7)
       specinfra (~> 2.10)
-    chef-zero (4.2.1)
+      syslog-logger (~> 1.6)
+    chef-config (12.4.0)
+      mixlib-config (~> 2.0)
+      mixlib-shellout (~> 2.0)
+    chef-zero (4.2.3)
       ffi-yajl (>= 1.1, < 3.0)
       hashie (~> 2.0)
       mixlib-log (~> 1.3)
@@ -58,35 +70,52 @@ GEM
     domain_name (0.5.24)
       unf (>= 0.0.5, < 1.0.0)
     erubis (2.7.0)
-    facter (2.4.3)
+    facter (2.4.4)
       CFPropertyList (~> 2.2.6)
-    ffi (1.9.8)
-    ffi-yajl (2.0.0)
-      ffi (~> 1.5)
+    faraday (0.9.1)
+      multipart-post (>= 1.2, < 3)
+    ffi (1.9.10)
+    ffi-yajl (2.2.0)
       libyajl2 (~> 1.2)
+    git (1.2.9.1)
     hashie (2.1.2)
-    hiera (2.0.0)
+    her (0.7.6)
+      activemodel (>= 3.0.0, <= 4.3.0)
+      activesupport (>= 3.0.0, <= 4.3.0)
+      faraday (>= 0.8, < 1.0)
+      multi_json (~> 1.7)
+    hiera (1.3.4)
       json_pure
-    highline (1.7.1)
+    highline (1.7.2)
     http-cookie (1.0.2)
       domain_name (~> 0.5)
+    i18n (0.7.0)
     ipaddress (0.8.0)
     jmespath (1.0.2)
       multi_json (~> 1.0)
+    json (1.8.3)
     json_pure (1.8.2)
+    librarian-puppet (2.1.0)
+      librarianp (>= 0.5.1)
+      puppet_forge
+      rsync
+    librarianp (0.6.3)
+      thor (~> 0.15)
     libyajl2 (1.2.0)
     metaclass (0.0.4)
     method_source (0.8.2)
-    mime-types (2.4.3)
+    mime-types (2.6.1)
+    minitest (5.7.0)
     mixlib-authentication (1.3.0)
       mixlib-log
     mixlib-cli (1.5.0)
-    mixlib-config (2.1.0)
+    mixlib-config (2.2.1)
     mixlib-log (1.6.0)
-    mixlib-shellout (2.0.1)
+    mixlib-shellout (2.1.0)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
-    multi_json (1.11.0)
+    multi_json (1.11.2)
+    multipart-post (2.0.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-ssh (2.9.2)
@@ -95,10 +124,11 @@ GEM
     net-ssh-multi (1.2.1)
       net-ssh (>= 2.6.5)
       net-ssh-gateway (>= 1.2.0)
+    net-telnet (0.1.1)
     netrc (0.10.3)
-    ohai (8.2.0)
+    ohai (8.5.0)
       ffi (~> 1.9)
-      ffi-yajl (>= 1.1, < 3.0)
+      ffi-yajl (~> 2.2)
       ipaddress
       mime-types (~> 2.0)
       mixlib-cli
@@ -113,58 +143,65 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    puppet (4.0.0)
-      facter (> 2.0, < 4)
-      hiera (>= 2.0, < 3)
+    puppet (3.7.5)
+      facter (> 1.6, < 3)
+      hiera (~> 1.0)
       json_pure
     puppet-lint (1.1.0)
     puppet-syntax (2.0.0)
       rake
-    puppetlabs_spec_helper (0.10.2)
+    puppet_forge (1.0.4)
+      her (~> 0.6)
+    puppetlabs_spec_helper (0.10.3)
       mocha
       puppet-lint
       puppet-syntax
       rake
       rspec-puppet
-    rack (1.6.0)
+    rack (1.6.4)
     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)
+    rspec (3.3.0)
+      rspec-core (~> 3.3.0)
+      rspec-expectations (~> 3.3.0)
+      rspec-mocks (~> 3.3.0)
+    rspec-core (3.3.1)
+      rspec-support (~> 3.3.0)
+    rspec-expectations (3.3.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
+      rspec-support (~> 3.3.0)
     rspec-its (1.2.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.2.1)
+    rspec-mocks (3.3.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-puppet (2.0.1)
+      rspec-support (~> 3.3.0)
+    rspec-puppet (2.2.0)
       rspec
-    rspec-support (3.2.2)
-    rspec_junit_formatter (0.2.0)
+    rspec-support (3.3.0)
+    rspec_junit_formatter (0.2.3)
       builder (< 4)
-      rspec (>= 2, < 4)
-      rspec-core (!= 2.12.0)
-    serverspec (2.14.1)
+      rspec-core (>= 2, < 4, != 2.12.0)
+    rsync (1.0.9)
+    serverspec (2.19.0)
       multi_json
       rspec (~> 3.0)
       rspec-its
-      specinfra (~> 2.25)
+      specinfra (~> 2.35)
     slop (3.6.0)
-    specinfra (2.28.4)
+    specinfra (2.36.16)
       net-scp
       net-ssh
+      net-telnet
+    syslog-logger (1.6.8)
     systemu (2.6.5)
     thor (0.19.1)
+    thread_safe (0.3.5)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.1)
@@ -176,8 +213,9 @@ PLATFORMS
 
 DEPENDENCIES
   chef
+  librarian-puppet (= 2.1.0)
   opskeleton!
   pry
-  puppet
+  puppet (= 3.7.5)
   puppetlabs_spec_helper (>= 0.1.0)
   rspec-puppet

data/bin/opsk

@@ -20,6 +20,7 @@ module Opsk
     register Opsk::Module, 'module', 'module [name]', 'generate an rspec ready Puppet module'
     register Opsk::Package, 'package', 'package', 'packages current module for celestial'
     register Opsk::Dockerize, 'dockerize', 'dockerize [from] [os_type]', 'Creates a docker image from the current sandbox'
+    register Opsk::Commit, 'commit', 'commit [message]', 'commit each changed puppet module under modules folder'
     register Opsk::Clean, 'clean', 'clean', 'cleans up packaging products'
     register Opsk::Bump, 'bump', 'bump', 'bumps up version (clearing old version also)'
     register Opsk::DeployBintray, 'deploy_bintray', 'deploy_bintray [repo]', 'deploy packge into bintray.com'

data/lib/opskeleton/commit.rb

@@ -0,0 +1,26 @@
+module  Opsk
+  class Commit < Thor::Group
+    include Thorable, Thor::Actions
+
+    argument :message, :type => :string, :desc => 'commit message'
+
+    def validate
+	check_root
+    end
+
+    def commit
+	Dir["modules/*"].reject{|o| not File.directory?(o)}.each do |d|
+	  g = Git.init(d)
+	  if g.status.changed.keys.length > 0
+	   if message
+	     g.commit_all(message) 
+	   else 
+	     puts 'please provide commit message'
+	     g.commit_all(gets) 
+	   end
+	  end
+	end
+    end
+
+  end
+end

data/lib/opskeleton/deploy_bintray.rb

@@ -26,6 +26,7 @@ module  Opsk
 	  end
 	else
 	  say('package is missing please run opsk package first')
+	  exit(1)
 	end
     end
 

data/lib/opskeleton/deploy_s3.rb

@@ -41,6 +41,7 @@ module  Opsk
 	  end
 	else
 	  say('package is missing please run opsk package first')
+	  exit(1)
 	end
     end
 

data/lib/opskeleton/deploy_scp.rb

@@ -38,6 +38,7 @@ module  Opsk
 	  end
 	else
 	  say('package is missing please run opsk package first')
+	  exit(1)
 	end
     end
 

data/lib/opskeleton/version.rb

@@ -1,3 +1,3 @@
 module Opskeleton
-  VERSION = '0.8.10'
+  VERSION = '0.8.11'
 end

data/lib/opskeleton.rb

@@ -3,6 +3,7 @@ require 'thor'
 require 'thor/group'
 require 'yaml'
 require 'ostruct'
+require 'git'
 require 'opskeleton/thorable'
 require 'opskeleton/dockerize'
 require 'opskeleton/package'
@@ -14,4 +15,5 @@ require 'opskeleton/deploy_bintray'
 require 'opskeleton/deploy_s3'
 require 'opskeleton/deploy_scp'
 require 'opskeleton/module'
+require 'opskeleton/commit'
 

data/opskeleton.gemspec

@@ -15,9 +15,11 @@ Gem::Specification.new do |gem|
   gem.add_dependency('bintray_deploy')
   gem.add_dependency('aws-sdk', '~> 2')
   gem.add_dependency('net-scp')
-  gem.add_development_dependency('puppet')
+  gem.add_dependency('git')
+  gem.add_development_dependency('puppet','=3.7.5')
   gem.add_development_dependency('chef')
   gem.add_development_dependency('rspec-puppet')
+  gem.add_development_dependency('librarian-puppet', '= 2.1.0')
   gem.add_development_dependency('puppetlabs_spec_helper', '>= 0.1.0')
   gem.add_development_dependency('pry')
 

data/templates/parent/spec/spec_helper.erb

@@ -33,7 +33,7 @@ RSpec.configure do |c|
     c.ssh.close if c.ssh
     options = Net::SSH::Config.for(c.host)
     if(!ENV['LOCAL'])
-	run("vagrant destroy #{c.host} -f")
+	run("vagrant destroy #{c.host} -f") unless ENV['SKIP_DESTROY']
       <% if(options[:bench_enable]) %>
       WATCH.reset
       <% end %>

data/templates/puppetfile.erb

@@ -1,8 +1,3 @@
 forge 'https://forgeapi.puppetlabs.com'
 
 mod 'puppetlabs/stdlib'
-<% if(box.include?('ubuntu')) %>
-mod 'puppetlabs/apt'
-<% end %>
-mod 'mstrauss/editfile', 
-   :git => 'git://github.com/mstrauss/puppet-editfile.git'

data/test/commit_test.rb

@@ -0,0 +1,40 @@
+$LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
+
+require 'minitest/autorun'
+require_relative 'test_helper'
+require 'fileutils'
+require 'git'
+
+SANDBOX = 'commit'
+ROOT = "#{SANDBOX}-sandbox/modules/foo"
+class CommitTest < MiniTest::Unit::TestCase
+  include FileUtils
+
+  def setup
+    Opsk::Root.start ['generate_puppet', 'commit', 'bar']
+    mkdir_p(ROOT)
+    g = Git.init(ROOT)
+    touch("#{ROOT}/bla.txt")
+    g.add('bla.txt')
+    g.commit_all('message')
+    open("#{ROOT}/bla.txt", 'a') { |f| f.puts 'Hello, world.'}
+  end
+
+  def teardown 
+    rm_rf "#{SANDBOX}-sandbox"
+  end
+
+  def with_cwd(dir)
+    Dir.chdir dir do
+	yield  
+    end
+  end
+
+  def test_commit
+    with_cwd "#{SANDBOX}-sandbox" do
+	 Opsk::Root.start ['commit','some message']
+    end 	
+    g = Git.init(ROOT)
+    assert g.show.include? 'some message'
+  end
+end

data/test/puppet_package_test.rb

@@ -46,4 +46,5 @@ class PuppetPackageTest < MiniTest::Unit::TestCase
 	assert_equal(f.read , 'my script')
     } 	
   end
+
 end

data/test/test_helper.rb

@@ -9,7 +9,8 @@ module Opsk
     register Opsk::GeneratePuppet, 'generate_puppet', 'generate_puppet [name] [box]', 'generates opskelaton project structure'
     register Opsk::GenerateChef, 'generate_chef', 'generate_chef [name] [box]', 'generates opskelaton project structure'
     register Opsk::Package, 'package', 'package', 'packages current module for celestial'
+    register Opsk::Commit, 'commit', 'commit', 'commits current module for celestial'
 
-    end 
+  end 
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opskeleton
 version: !ruby/object:Gem::Version
-  version: 0.8.10
+  version: 0.8.11
 platform: ruby
 authors:
 - narkisr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-04 00:00:00.000000000 Z
+date: 2015-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -67,19 +67,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: puppet
+  name: git
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: puppet
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.7.5
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.7.5
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: librarian-puppet
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: puppetlabs_spec_helper
   requirement: !ruby/object:Gem::Requirement
@@ -167,6 +195,7 @@ files:
 - lib/opskeleton.rb
 - lib/opskeleton/bump.rb
 - lib/opskeleton/clean.rb
+- lib/opskeleton/commit.rb
 - lib/opskeleton/deploy_bintray.rb
 - lib/opskeleton/deploy_s3.rb
 - lib/opskeleton/deploy_scp.rb
@@ -220,6 +249,7 @@ files:
 - templates/ruby-version.erb
 - templates/spec.erb
 - test/chef_package_test.rb
+- test/commit_test.rb
 - test/puppet_package_test.rb
 - test/test_helper.rb
 homepage: https://github.com/narkisr/opskeleton
@@ -247,5 +277,6 @@ specification_version: 4
 summary: A generator for ops projects that include vagrant puppet and fpm
 test_files:
 - test/chef_package_test.rb
+- test/commit_test.rb
 - test/puppet_package_test.rb
 - test/test_helper.rb