opskeleton 0.3.3 → 0.4.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    opskeleton (0.3.3)
+    opskeleton (0.4.0)
       thor
 
 GEM

data/bin/opsk

@@ -14,6 +14,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::Clean, 'clean', 'clean', 'cleans up packaging products'
+    register Opsk::Bump, 'bump', 'bump', 'bumps up version (clearing old version also)'
 
     desc 'version', 'print opsk version'  
     def version

data/lib/opskeleton/bump.rb

@@ -0,0 +1,20 @@
+module  Opsk
+  class Bump < Thor::Group
+    include Thorable, Thor::Actions
+
+    argument :version, :type => :string, :desc => 'new version number'
+
+    def meta 
+	 OpenStruct.new(YAML.load_file('opsk.yml'))
+    end
+
+    def bump
+      new_meta = meta
+	new_meta.version = version
+	File.open('opsk.yml', 'w') {|f| f.write(new_meta.marshal_dump.to_yaml)}
+    end
+
+  end
+
+end
+

data/lib/opskeleton/clean.rb

@@ -12,7 +12,6 @@ module  Opsk
 
     def cleanup
 	remove_dir('pkg')
-	remove_dir("#{name}-#{meta.version}")
     end
 
   end

data/lib/opskeleton/package.rb

@@ -14,16 +14,20 @@ module  Opsk
     	"#{name}-#{meta.version}"
     end
 
+    def artifact_path
+    	"pkg/#{name}-#{meta.version}"
+    end
+
     def create_build
-	empty_directory(artifact)
-	path = Dir.getwd
-	directory path , artifact , :verbose => false
-	empty_directory("#{artifact}/scripts")
+	empty_directory(artifact_path)
+      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}/scripts/#{s}")
-	  chmod("#{artifact}/scripts/#{s}", 0755)
+	  template("templates/scripts/#{s}", "#{artifact_path}/scripts/#{s}")
+	  chmod("#{artifact_path}/scripts/#{s}", 0755)
 	end
-	template('templates/puppet/site.erb', "#{artifact}/manifests/site.pp")
+	template('templates/puppet/site.erb', "#{artifact_path}/manifests/site.pp")
     end
 
     def create_pkg
@@ -34,7 +38,11 @@ module  Opsk
 	ignored = IO.readlines('.gitignore').map(&:chomp)
 	ignored.delete('modules')
 	excludes = ignored.map{|f| "'#{f}'"}.join(" --exclude=") << ' --exclude-backups --exclude-vcs --exclude=pkg'
-	run("tar --exclude=#{excludes} -czf pkg/#{artifact}.tar.gz #{artifact} > /dev/null", :verbose => false)
+	tar = "#{artifact}.tar.gz"
+	input = artifact
+	inside('pkg') do
+	  run("tar --exclude=#{excludes} -czf #{tar} #{input}") 
+	end
     end
 
   end

data/lib/opskeleton/version.rb

@@ -1,3 +1,3 @@
 module Opskeleton
-  VERSION = "0.3.3"
+  VERSION = '0.4.0'
 end

data/lib/opskeleton.rb

@@ -6,6 +6,7 @@ require 'ostruct'
 require 'opskeleton/thorable'
 require 'opskeleton/package'
 require 'opskeleton/clean'
+require 'opskeleton/bump'
 require 'opskeleton/generate'
 require 'opskeleton/module'
 

data/test/package_test.rb

@@ -25,9 +25,9 @@ class PackageTest < MiniTest::Unit::TestCase
    with_cwd 'foo-sandbox' do
      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/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
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opskeleton
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-11 00:00:00.000000000 Z
+date: 2013-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -112,6 +112,7 @@ files:
 - autocomplete/opsk_bash_completion
 - bin/opsk
 - lib/opskeleton.rb
+- lib/opskeleton/bump.rb
 - lib/opskeleton/clean.rb
 - lib/opskeleton/generate.rb
 - lib/opskeleton/module.rb
@@ -158,7 +159,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 469803852004423881
+      hash: 970481843702191626
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -167,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 469803852004423881
+      hash: 970481843702191626
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25