opskeleton 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 686cf3d0a07e85e00ab8aec8f5bb60090b536770
-  data.tar.gz: d5b8464c039cf0034e947f10f334d4d54343058f
+  metadata.gz: d95a0b8e5bde4b613a48c45caa8b4cf85b1388f8
+  data.tar.gz: e4c76e9287363d91b0c514e7d757558d0f999293
 SHA512:
-  metadata.gz: dc71a15222e5fa3fa5500028b4a82acde1ad9801a604e0927bf4889f76bbbac1badf31891854c98307224e5e543a12e50152a1c7c390c8bba76e1dd46f97fafa
-  data.tar.gz: 881a929134d97a0c275db42d507e07f22db9713ce62c0b4e58cd9124a0be86caceec5a50bd3a640a4a0da706e5b2fffdc382938bb1b051286763e97a128f2e57
+  metadata.gz: 4bbe0984a5e2b88da758154e0e642baae5c1331445faef19b7b863542d204917f2ab565881803403252814601af99ca07d8b77ab0b0ab562216398929b7afa8d
+  data.tar.gz: 6aad045195cc81798c27802cc97ef4111c814602c5c22504e0dcbcd1edb252417ee3b470ab20a4047c4ca2ec73ef37df23eff590b3ab3393119e091925ddb2da

data/Gemfile.lock

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

data/lib/opskeleton/generate_chef.rb

@@ -23,7 +23,7 @@ module Opsk
     end
 
     def create_rakefile
-	copy_file('templates/Rakefile', "#{path}/Rakefile")
+	copy_file('templates/chef/Rakefile', "#{path}/Rakefile")
     end
 
     def create_version
@@ -44,7 +44,7 @@ module Opsk
 	template('templates/chef/dna.json.erb', "#{path}/dna.json")
 	copy_file('templates/chef/run.sh', "#{path}/run.sh")
 	copy_file('templates/chef/solo.rb', "#{path}/solo.rb")
-	copy_file('templates/boot.sh', "#{path}/boot.sh")
+	copy_file('templates/chef/boot.sh', "#{path}/boot.sh")
 	chmod("#{path}/run.sh", 0755)
 	chmod("#{path}/boot.sh", 0755)
     end

data/lib/opskeleton/generate_puppet.rb

@@ -28,7 +28,7 @@ module Opsk
     end
 
     def create_rakefile
-	copy_file('templates/Rakefile', "#{path}/Rakefile")
+	copy_file('templates/puppet/Rakefile', "#{path}/Rakefile")
     end
 
     def create_version
@@ -46,8 +46,8 @@ module Opsk
 	empty_directory("#{path}/manifests/")
 	template('templates/puppetfile.erb', "#{path}/Puppetfile")
 	template('templates/puppet/default.erb', "#{path}/manifests/default.pp")
-	copy_file('templates/run.sh', "#{path}/run.sh")
-	copy_file('templates/boot.sh', "#{path}/boot.sh")
+	copy_file('templates/puppet/run.sh', "#{path}/run.sh")
+	copy_file('templates/puppet/boot.sh', "#{path}/boot.sh")
 	chmod("#{path}/run.sh", 0755)
 	chmod("#{path}/boot.sh", 0755)
     end

data/lib/opskeleton/package.rb

@@ -3,35 +3,44 @@ module  Opsk
     include Thorable, Thor::Actions
 
     def meta 
-	 OpenStruct.new(YAML.load_file('opsk.yml'))
+	OpenStruct.new(YAML.load_file('opsk.yml'))
     end
 
     def name 
-     	File.basename(Dir.getwd)
+	File.basename(Dir.getwd)
     end
 
     def artifact
-    	"#{name}-#{meta.version}"
+	"#{name}-#{meta.version}"
     end
 
     def artifact_path
-    	"pkg/#{name}-#{meta.version}"
+	"pkg/#{name}-#{meta.version}"
     end
 
     def create_build
 	empty_directory(artifact_path)
-      path = Dir.getwd
+	path = Dir.getwd
 	directory path, artifact_path, :verbose => false
-	empty_directory("#{artifact_path}/scripts")
-	%w(lookup.rb run.sh).each  do |s|
-	  template("templates/scripts/#{s}", "#{artifact_path}/scripts/#{s}")
-	  chmod("#{artifact_path}/scripts/#{s}", 0755)
-	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|
+	  unless(File.exists?("#{artifact_path}/scripts/#{s}"))
+	    template("templates/#{type}/scripts/#{s}", "#{artifact_path}/scripts/#{s}")
+	    chmod("#{artifact_path}/scripts/#{s}", 0755)
+	  end
+	end
+    end
+
     def create_pkg
 	empty_directory('pkg')
     end

data/lib/opskeleton/version.rb

@@ -1,3 +1,3 @@
 module Opskeleton
-  VERSION = '0.5.1'
+  VERSION = '0.5.2'
 end

data/templates/chef/Rakefile

@@ -0,0 +1,20 @@
+require 'rake'
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.pattern = 'spec/*/*_spec.rb'
+end
+
+task :default => :spec
+
+task :modspec do
+    FileList["static-modules/**/Rakefile"].each do |project|
+        Rake::Task.clear
+        load project
+        dir = project.pathmap("%d")
+        Dir.chdir(dir) do
+          spec_task = Rake::Task[:spec]
+          spec_task.invoke()
+        end
+    end
+end

data/templates/chef/boot.sh

@@ -0,0 +1,4 @@
+gem install bundle
+bundle install
+librarian-chef install
+vagrant up

data/test/chef_package_test.rb

@@ -30,6 +30,7 @@ class ChefPackageTest < MiniTest::Unit::TestCase
     end
     assert File.exists?('foo-sandbox/pkg/foo-sandbox-0.0.1/Cheffile')
     assert File.exists?('foo-sandbox/pkg/foo-sandbox-0.0.1/roles/foo.rb')
+    assert File.exists?('foo-sandbox/pkg/foo-sandbox-0.0.1/boot.sh')
     assert Dir.exists?('foo-sandbox/pkg/foo-sandbox-0.0.1/cookbooks')
     assert File.exists?('foo-sandbox/pkg/foo-sandbox-0.0.1/dna.json')
     assert File.exists?('foo-sandbox/pkg/foo-sandbox-0.0.1.tar.gz')

data/test/puppet_package_test.rb

@@ -22,13 +22,23 @@ class PuppetPackageTest < MiniTest::Unit::TestCase
   end
 
   def test_build
-   with_cwd 'foo-sandbox' do
-     Opsk::Root.start ['package']
-   end
-   assert File.exists?('foo-sandbox/pkg/foo-sandbox-0.0.1/Puppetfile')
-   assert File.exists?('foo-sandbox/pkg/foo-sandbox-0.0.1/manifests/site.pp')
-   assert File.exists?('foo-sandbox/pkg/foo-sandbox-0.0.1/scripts/run.sh')
-   assert File.exists?('foo-sandbox/pkg/foo-sandbox-0.0.1.tar.gz')
+    with_cwd 'foo-sandbox' do
+	Opsk::Root.start ['package']
+    end
+    assert File.exists?('foo-sandbox/pkg/foo-sandbox-0.0.1/Puppetfile')
+    assert File.exists?('foo-sandbox/pkg/foo-sandbox-0.0.1/manifests/site.pp')
+    assert File.exists?('foo-sandbox/pkg/foo-sandbox-0.0.1/scripts/run.sh')
+    assert File.exists?('foo-sandbox/pkg/foo-sandbox-0.0.1.tar.gz')
   end
 
+  def test_script_override
+    Dir.mkdir('foo-sandbox/scripts/')
+    File.open('foo-sandbox/scripts/run.sh', 'w') { |f| f.write('my script') } 	
+    with_cwd 'foo-sandbox' do  
+	Opsk::Root.start ['package']
+    end
+    File.open('foo-sandbox/pkg/foo-sandbox-0.0.1/scripts/run.sh', 'r') { |f| 
+	assert_equal(f.read , 'my script')
+    } 	
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opskeleton
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - narkisr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-15 00:00:00.000000000 Z
+date: 2014-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -142,9 +142,9 @@ files:
 - opskeleton.gemspec
 - templates/LICENSE-2.0.txt
 - templates/README.erb
-- templates/Rakefile
-- templates/boot.sh
 - templates/chef/Cheffile
+- templates/chef/Rakefile
+- templates/chef/boot.sh
 - templates/chef/dna.json.erb
 - templates/chef/gemfile
 - templates/chef/gitignore
@@ -163,14 +163,16 @@ files:
 - 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/run.sh
+- templates/puppet/scripts/lookup.rb
+- templates/puppet/scripts/run.sh
 - templates/puppet/site.erb
 - templates/puppetfile.erb
 - templates/ruby-gemset.erb
 - templates/ruby-version.erb
-- templates/run.sh
-- templates/scripts/lookup.rb
-- templates/scripts/run.sh
 - templates/spec.erb
 - templates/vagrant.erb
 - templates/vagrant_bsd.erb