opskeleton 0.1.2 → 0.1.3

data/lib/opskeleton/generate.rb

@@ -36,7 +36,7 @@ module Opsk
 	empty_directory("#{path}/static-modules/")
 	empty_directory("#{path}/manifests/")
 	template('templates/puppetfile.erb', "#{path}/Puppetfile")
-	template('templates/default.erb', "#{path}/manifests/default.pp")
+	template('templates/puppet/default.erb', "#{path}/manifests/default.pp")
 	copy_file('templates/run.sh', "#{path}/run.sh")
 	chmod("#{path}/run.sh", 0755)
     end

data/lib/opskeleton/package.rb

@@ -23,6 +23,7 @@ module  Opsk
 	  template("templates/scripts/#{s}", "#{artifact}/scripts/#{s}")
 	  chmod("#{artifact}/scripts/#{s}", 0755)
 	end
+	template('templates/puppet/site.erb', "#{artifact}/manifests/site.pp")
     end
 
     def create_pkg

data/lib/opskeleton/version.rb

@@ -1,3 +1,3 @@
 module Opskeleton
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/templates/scripts/lookup.sh

@@ -1,4 +1,4 @@
 #!/bin/sh
 
 export ip=`echo $SSH_CONNECTION |  cut -d  ' ' -f 1`
-wget -q -O -  "http://$ip:8080/registry/profile/$1"
+wget -q -O -  "http://$ip:8080/registry/host/type/$1"

data/templates/scripts/run.sh

@@ -1,2 +1,2 @@
-puppet apply --modulepath=modules:static-modules manifests/default.pp\
+puppet apply --modulepath=modules:static-modules manifests/site.pp\
   --node_terminus exec --external_nodes=`pwd`/scripts/lookup.sh --hiera_config hiera.yaml $@

data/test/package_test.rb

@@ -26,8 +26,8 @@ class PackageTest < MiniTest::Unit::TestCase
      Opsk::Root.start ['package']
    end
    assert File.exists?('foo-sandbox/foo-sandbox-0.0.1/Puppetfile')
+   assert File.exists?('foo-sandbox/foo-sandbox-0.0.1/manifests/site.pp')
    assert File.exists?('foo-sandbox/foo-sandbox-0.0.1/scripts/run.sh')
-
    assert File.exists?('foo-sandbox/pkg/foo-sandbox-0.0.1.tar.gz')
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opskeleton
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-19 00:00:00.000000000 Z
+date: 2013-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -53,11 +53,12 @@ files:
 - templates/README.erb
 - templates/Rakefile
 - templates/clean.yaml
-- templates/default.erb
 - templates/gemfile
 - templates/gitignore
 - templates/hiera.yaml
 - templates/opsk.yml
+- templates/puppet/default.erb
+- templates/puppet/site.erb
 - templates/puppetfile.erb
 - templates/run.sh
 - templates/rvmrc.erb