opskeleton 0.2.1 → 0.3.0

data/.ruby-version

@@ -1 +1 @@
-ruby-1.9.3-p392
+ruby-1.9.3-p429

data/Gemfile.lock

@@ -1,18 +1,47 @@
 PATH
   remote: .
   specs:
-    opskeleton (0.2.1)
+    opskeleton (0.3.0)
       thor
 
 GEM
   remote: https://rubygems.org/
   specs:
     coderay (1.0.9)
+    diff-lcs (1.2.4)
+    facter (1.7.1)
+    hiera (1.2.1)
+      json_pure
+    json_pure (1.8.0)
+    metaclass (0.0.1)
     method_source (0.8.1)
+    mocha (0.14.0)
+      metaclass (~> 0.0.1)
     pry (0.9.12)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.4)
+    puppet (3.2.1)
+      facter (~> 1.6)
+      hiera (~> 1.0)
+      rgen (~> 0.6)
+    puppetlabs_spec_helper (0.4.1)
+      mocha (>= 0.10.5)
+      rake
+      rspec (>= 2.9.0)
+      rspec-puppet (>= 0.1.1)
+    rake (10.0.4)
+    rgen (0.6.2)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.1)
+    rspec-puppet (0.1.6)
+      rspec
     slop (3.4.4)
     thor (0.18.1)
 
@@ -22,3 +51,6 @@ PLATFORMS
 DEPENDENCIES
   opskeleton!
   pry
+  puppet
+  puppetlabs_spec_helper (>= 0.1.0)
+  rspec-puppet

data/bin/opsk

@@ -7,39 +7,11 @@ require 'thor/runner'
 require 'thor/group'
 require 'opskeleton'
 
-module Opsk
-  class Specgen < Thor::Group
-    include Thor::Actions
-
-    argument :name, :type => :string, :desc => "static module name"
-
-    def self.source_root
-	# during dev time
-	if(File.dirname(__FILE__) == './bin')
-	  File.dirname('.')
-	else 
-	  "#{File.dirname(__FILE__)}/../"
-	end
-    end
-
-    def create_spec_folders
-	%w(classes defines functions hosts).each do |t|
-	  empty_directory("static-modules/#{name}/spec/#{t}")
-	end
-    end
-
-    def create_class_spec
-	template('templates/spec.erb', "static-modules/#{name}/spec/classes/")
-    end
-  end
-end
-
-
 module Opsk
   class Root < Thor
 
     register Opsk::Generate, 'generate', "generate [name] [box]", 'generates opskelaton project structure'
-    register Opsk::Specgen, 'specgen', 'specgen [module]', 'generates rspec-puppet for static-modules/module'
+    register Opsk::Module, 'module', 'module [name]', 'generate an rspec ready Puppet module'
     register Opsk::Package, 'package', 'package', 'packages current module for celestial'
 
     desc 'version', 'print opsk version'  

data/lib/opskeleton/generate.rb

@@ -60,6 +60,10 @@ module Opsk
 	copy_file('templates/LICENSE-2.0.txt',"#{path}/LICENSE-2.0.txt")
     end
 
+    def travis
+	template('templates/parent/travis.erb', "#{path}/.travis.yml")
+    end
+
     def git
 	if(!File.exists?("#{path}/.git"))
 	   copy_file('templates/gitignore', "#{path}/.gitignore")

data/lib/opskeleton/module.rb

@@ -0,0 +1,34 @@
+module Opsk 
+  class Module < Thor::Group
+    include Thorable, Thor::Actions
+
+    argument :name, :type => :string, :desc => 'module name'
+
+    desc 'Generate an rspec enabled Puppet module'
+
+    def create_module
+	inside('static-modules') do
+	  run("puppet module generate puppet-#{name}")
+	  run("mv puppet-#{name} #{name}")
+	end
+    end
+
+    def rspec
+     inside("static-modules/#{name}/") do
+	 run("rspec-puppet-init")
+     end
+    end
+
+    def create_rakefile
+      rakefile = "static-modules/#{name}/Rakefile"
+      remove_file(rakefile)
+	template('templates/module/Rakefile.erb',rakefile)
+    end
+
+   def spec_helper
+     spec_helper = "static-modules/#{name}/spec/spec_helper.rb"
+     remove_file(spec_helper)
+     template('templates/module/spec_helper.rb',spec_helper)
+   end
+  end
+end

data/lib/opskeleton/version.rb

@@ -1,3 +1,3 @@
 module Opskeleton
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/lib/opskeleton.rb

@@ -6,4 +6,5 @@ require 'ostruct'
 require 'opskeleton/thorable'
 require 'opskeleton/package'
 require 'opskeleton/generate'
+require 'opskeleton/module'
 

data/opskeleton.gemspec

@@ -12,6 +12,9 @@ Gem::Specification.new do |gem|
   gem.summary       = %q{A generator for ops projects that include vagrant puppet and fpm}
   gem.homepage      = "https://github.com/narkisr/opskeleton"
   gem.add_dependency('thor')
+  gem.add_development_dependency('puppet')
+  gem.add_development_dependency('rspec-puppet')
+  gem.add_development_dependency('puppetlabs_spec_helper', '>= 0.1.0')
   gem.add_development_dependency('pry')
 
   gem.files         = `git ls-files`.split($/)

data/templates/Rakefile

@@ -1,9 +1,15 @@
-require 'rake'
-require 'rspec/core/rake_task'
-require 'puppet-lint/tasks/puppet-lint'
-
-RSpec::Core::RakeTask.new(:spec) do |t|
-    t.pattern = 'spec/*/*_spec.rb'
+task :spec 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
 
-task :default => [:spec, :lint]
+require 'puppet-lint/tasks/puppet-lint'
+PuppetLint.configuration.ignore_paths =['modules/**/*']
+PuppetLint.configuration.send("disable_80chars")

data/templates/gemfile

@@ -1,9 +1,14 @@
-# opskelaton Gems
 source "https://rubygems.org"
 
+# base
 gem 'puppet'
+
+# testing
+gem 'rspec-puppet'
+gem 'puppetlabs_spec_helper', '>= 0.1.0'
+
+# build 
 gem 'puppet-lint'
-gem 'librarian-puppet'
 gem 'rake'
-gem 'rspec-puppet'
+gem 'librarian-puppet'
 gem 'opskeleton'

data/templates/module/Rakefile.erb

@@ -0,0 +1,22 @@
+require 'rubygems'
+require 'rake'
+require 'rspec/core/rake_task'
+require 'puppet-lint/tasks/puppet-lint'
+
+link = 'spec/fixtures/modules/<%=name%>/manifests'
+target = 'spec/fixtures/modules/<%=name%>/'
+
+task :link do
+  FileUtils.mkdir_p target
+  symlink('../../../../manifests',link) unless File.exists?(link)
+end
+
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.pattern = 'spec/*/*_spec.rb'
+end
+
+task :default => [:link,:spec]
+
+PuppetLint.configuration.ignore_paths =['modules/**/*']
+PuppetLint.configuration.send("disable_80chars")
+

data/templates/module/spec_helper.rb

@@ -0,0 +1,8 @@
+require 'rspec-puppet'
+
+fixture_path = File.expand_path(File.join(__FILE__, '..', 'fixtures'))
+
+RSpec.configure do |c|
+  c.module_path = "#{File.join(fixture_path, 'modules')}:modules"
+  c.manifest_dir = File.join(fixture_path, 'manifests')
+end

data/templates/parent/travis.erb

@@ -0,0 +1,8 @@
+language: ruby
+rvm:
+  - 1.9.3
+script:
+  - "librarian-puppet install"
+  - "rake lint"
+  - "rake spec"
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opskeleton
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-28 00:00:00.000000000 Z
+date: 2013-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -27,6 +27,54 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: puppet
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-puppet
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: puppetlabs_spec_helper
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -65,6 +113,7 @@ files:
 - bin/opsk
 - lib/opskeleton.rb
 - lib/opskeleton/generate.rb
+- lib/opskeleton/module.rb
 - lib/opskeleton/package.rb
 - lib/opskeleton/thorable.rb
 - lib/opskeleton/version.rb
@@ -77,7 +126,10 @@ files:
 - templates/gitignore
 - templates/hiera.yaml
 - templates/hiera_vagrant.yaml
+- templates/module/Rakefile.erb
+- templates/module/spec_helper.rb
 - templates/opsk.yml
+- templates/parent/travis.erb
 - templates/puppet/default.erb
 - templates/puppet/site.erb
 - templates/puppetfile.erb
@@ -103,12 +155,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3993076141945134336
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3993076141945134336
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25