opskeleton 0.5.3 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49845072d32dfeca817fda79d08e58b8b6aed707
-  data.tar.gz: 422e0d8d2077cd3758bb6f7fd594b7d1548db994
+  metadata.gz: f22aa1a6e4da0ef0342fcbf5cfc332dd528aa20d
+  data.tar.gz: 999a1edd0c9c0b45462081f30cf79a4b7d1d1333
 SHA512:
-  metadata.gz: ae9b800a90e235e32afc7909a18a8864f9c1601ed8a5351ec847c3023a8bf36dbf86ff59c4b3f2da22f8540710d507ecc681b5caada781e5c91b14f3f5d5e94f
-  data.tar.gz: 191fd195d0881ef38fd312f533c44eff64d7c448eed4ceb1b0e1b164b60ccb1647d80b525e82acc49e00a88114a265651ecece69df458a0e3fe9e2dcc19d93ce
+  metadata.gz: 76d68f79fd1539252aa4a9d43e65788425200fd6fc3f1436489882ccb4cb3d07d1e4792a9504c54e3c2d067c5b1a099d0c66836e71971b4c2d18d52305955186
+  data.tar.gz: 2d5b8ed6ee33b1eff82b63c0d695d7be0d971dd7677e487336a0da63828d235556ad3c22431717c16cce151c5b4c2fdfa3ce191b471504163d4e411656fde0b4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    opskeleton (0.5.3)
+    opskeleton (0.6.0)
       bintray_deploy
       thor
 

data/RELEASE-NOTES.md

@@ -0,0 +1,7 @@
+# Celestial 0.6.0 (06/08/14):
+
+## Fixes:
+* Changing opsk yml extension to yaml (matching proper extension name).
+
+## New Features:
+* opsk.yaml inclues section, this section specifies which files/folder will be packaged upon running opsk package.

data/bin/opsk

@@ -7,6 +7,11 @@ require 'thor/runner'
 require 'thor/group'
 require 'opskeleton'
 
+if(File.exists?('opks.yml'))
+  error 'opsk.yml found please rename to opsk.yaml' 
+  exit 1
+end
+
 module Opsk
   class Root < Thor
 

data/lib/opskeleton/bump.rb

@@ -5,13 +5,13 @@ module  Opsk
     argument :version, :type => :string, :desc => 'new version number'
 
     def meta 
-	 OpenStruct.new(YAML.load_file('opsk.yml'))
+	 OpenStruct.new(YAML.load_file('opsk.yaml'))
     end
 
     def bump
       new_meta = meta
 	new_meta.version = version
-	File.open('opsk.yml', 'w') {|f| f.write(new_meta.marshal_dump.to_yaml)}
+	File.open('opsk.yaml', 'w') {|f| f.write(new_meta.marshal_dump.to_yaml)}
     end
 
   end

data/lib/opskeleton/clean.rb

@@ -3,7 +3,7 @@ module  Opsk
     include Thorable, Thor::Actions
 
     def meta 
-	 OpenStruct.new(YAML.load_file('opsk.yml'))
+	 OpenStruct.new(YAML.load_file('opsk.yaml'))
     end
 
     def name 

data/lib/opskeleton/generate_chef.rb

@@ -27,7 +27,7 @@ module Opsk
     end
 
     def create_version
-	template('templates/opsk.yml', "#{path}/opsk.yml")
+	template('templates/chef/opsk.yaml', "#{path}/opsk.yaml")
     end
 
     def create_rvmrc

data/lib/opskeleton/generate_puppet.rb

@@ -32,7 +32,7 @@ module Opsk
     end
 
     def create_version
-	template('templates/opsk.yml', "#{path}/opsk.yml")
+	template('templates/puppet/opsk.yaml', "#{path}/opsk.yaml")
     end
 
     def create_rvmrc

data/lib/opskeleton/package.rb

@@ -3,7 +3,7 @@ module  Opsk
     include Thorable, Thor::Actions
 
     def meta 
-	OpenStruct.new(YAML.load_file('opsk.yml'))
+	OpenStruct.new(YAML.load_file('opsk.yaml'))
     end
 
     def name 
@@ -18,33 +18,40 @@ module  Opsk
 	"pkg/#{name}-#{meta.version}"
     end
 
+    def type_of
+	return :puppet if meta.includes.include?('Puppetfile')
+	return :chef if meta.includes.include?('Cheffile')
+	raise Exception.new('no matching provisoner type found, make sure to include Cheffile or Pupppetfile in opsk.yaml')
+    end
+
     def create_build
 	empty_directory(artifact_path)
 	path = Dir.getwd
-	directory path, artifact_path, :verbose => false
+	meta.includes.each {|f| 
+	  if(File.directory?("#{path}/#{f}"))
+	    directory "#{path}/#{f}", "#{artifact_path}/#{f}", :verbose => false
+	  elsif(File.exists?("#{path}/#{f}"))
+	    copy_file "#{path}/#{f}", "#{artifact_path}/#{f}"
+	  else
+	    raise Exception.new("#{f} not found please validate opks.yaml includes section")
+	  end
+	}
 	unless(File.exists?("#{artifact_path}/manifests/site.pp"))
 	  template('templates/puppet/site.erb', "#{artifact_path}/manifests/site.pp")
 	end
     end
 
     def scripts
-	type = :puppet if File.exists?("#{artifact_path}/Puppetfile")
-	type = :chef if File.exists?("#{artifact_path}/Cheffile")
-	raise Exception.new('not matching provisoner type found') if type.nil?
 	empty_directory("#{artifact_path}/scripts")
-      files = {:puppet => %w(lookup.rb run.sh) , :chef => [] }
-	files[type].each  do |s|
+	files = {:puppet => %w(lookup.rb run.sh) , :chef => [] }
+	files[type_of].each  do |s|
 	  unless(File.exists?("#{artifact_path}/scripts/#{s}"))
-	    template("templates/#{type}/scripts/#{s}", "#{artifact_path}/scripts/#{s}")
+	    template("templates/#{type_of}/scripts/#{s}", "#{artifact_path}/scripts/#{s}")
 	    chmod("#{artifact_path}/scripts/#{s}", 0755)
 	  end
 	end
     end
 
-    def create_pkg
-	empty_directory('pkg')
-    end
-
     def package
 	ignored = IO.readlines('.gitignore').map(&:chomp)
 	ignored.delete('modules')

data/lib/opskeleton/version.rb

@@ -1,3 +1,3 @@
 module Opskeleton
-  VERSION = '0.5.3'
+  VERSION = '0.6.0'
 end

data/templates/chef/opsk.yaml

@@ -0,0 +1,18 @@
+--- 
+  version: '0.0.1'
+  name: <%= name %>
+  includes: 
+    - Cheffile
+    - cookbooks
+    - static-cookbooks
+    - dna.json
+    - environments
+    - Gemfile
+    - Gemfile.lock
+    - opsk.yaml
+    - roles
+    - LICENSE-2.0.txt
+    - run.sh
+    - boot.sh
+    - solo.rb
+

data/templates/puppet/opsk.yaml

@@ -0,0 +1,14 @@
+--- 
+  version: '0.0.1'
+  name: <%= name %>
+  includes: 
+    - Puppetfile
+    - modules
+    - static-modules
+    - Gemfile
+    - Gemfile.lock
+    - opsk.yaml
+    - LICENSE-2.0.txt
+    - run.sh
+    - boot.sh
+

data/test/chef_package_test.rb

@@ -11,7 +11,7 @@ class ChefPackageTest < MiniTest::Unit::TestCase
     Opsk::Root.start ['generate_chef', 'foo', 'bar']
     Dir.mkdir('foo-sandbox/cookbooks')
     FileUtils.touch('foo-sandbox/cookbooks/1')
-
+    FileUtils.touch('foo-sandbox/Gemfile.lock')
   end
 
   def teardown 

data/test/puppet_package_test.rb

@@ -9,6 +9,8 @@ class PuppetPackageTest < MiniTest::Unit::TestCase
 
   def setup
     Opsk::Root.start ['generate_puppet', 'foo', 'bar']
+    FileUtils.touch('foo-sandbox/Gemfile.lock')
+    FileUtils.mkdir('foo-sandbox/modules')
   end
 
   def teardown 
@@ -32,6 +34,9 @@ class PuppetPackageTest < MiniTest::Unit::TestCase
   end
 
   def test_script_override
+    File.open('foo-sandbox/opsk.yaml', 'a') do |file|
+	file.puts '    - scripts'
+    end
     Dir.mkdir('foo-sandbox/scripts/')
     File.open('foo-sandbox/scripts/run.sh', 'w') { |f| f.write('my script') } 	
     with_cwd 'foo-sandbox' do  

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opskeleton
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.0
 platform: ruby
 authors:
 - narkisr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-05 00:00:00.000000000 Z
+date: 2014-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -125,6 +125,7 @@ files:
 - Gemfile.lock
 - LICENSE-2.0.txt
 - README.md
+- RELEASE-NOTES.md
 - Rakefile
 - TODOS
 - autocomplete/opsk_bash_completion
@@ -149,6 +150,7 @@ files:
 - templates/chef/environments/dev.rb
 - templates/chef/gemfile
 - templates/chef/gitignore
+- templates/chef/opsk.yaml
 - templates/chef/roles.erb
 - templates/chef/run.sh
 - templates/chef/solo.rb
@@ -160,13 +162,13 @@ files:
 - templates/hiera_vagrant.yaml
 - templates/module/Rakefile.erb
 - templates/module/spec_helper.rb
-- templates/opsk.yml
 - templates/parent/spec/default/httpd_spec.rb
 - templates/parent/spec/spec_helper.rb
 - templates/parent/travis.erb
 - templates/puppet/Rakefile
 - templates/puppet/boot.sh
 - templates/puppet/default.erb
+- templates/puppet/opsk.yaml
 - templates/puppet/run.sh
 - templates/puppet/scripts/lookup.rb
 - templates/puppet/scripts/run.sh
@@ -178,7 +180,6 @@ files:
 - templates/vagrant.erb
 - templates/vagrant_bsd.erb
 - test/chef_package_test.rb
-- test/generate_test.rb
 - test/puppet_package_test.rb
 - test/test_helper.rb
 homepage: https://github.com/narkisr/opskeleton
@@ -206,6 +207,5 @@ specification_version: 4
 summary: A generator for ops projects that include vagrant puppet and fpm
 test_files:
 - test/chef_package_test.rb
-- test/generate_test.rb
 - test/puppet_package_test.rb
 - test/test_helper.rb

data/templates/opsk.yml

@@ -1,3 +0,0 @@
---- 
-  version: '0.0.1'
-  name: <%= name %>

data/test/generate_test.rb

@@ -1,22 +0,0 @@
-$LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
-
-require 'minitest/autorun'
-require_relative 'test_helper'
-require 'fileutils'
-
-class GenerateTest< MiniTest::Unit::TestCase
-  include FileUtils
-
-  def setup
-    Opsk::Root.start ['generate_puppet', 'foo', 'bar']
-  end
-
-  def teardown 
-    rm_rf 'foo-sandbox'
-  end
-
-  def test_version
-    assert File.exists?('foo-sandbox/opsk.yml')
-  end
-
-end