opskeleton 0.4.9 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a98118097e8f9673381f953bbb3d69c1e84873de
-  data.tar.gz: 37266878cf0442b7690d5a640064a8116342e70b
+  metadata.gz: 3fa4623b72e3b36881ffec42eae4559298c30752
+  data.tar.gz: 2a3acc87e6dbf08893cc6ab979b15fdd77282721
 SHA512:
-  metadata.gz: a755d337668e8aa3197838c8ff0633caa6f705b6ac2de50ed86214f756480f1f3dc895a1feb88db354ca0bf8218db9e002faf9efa464f6b69f3bfecae813f492
-  data.tar.gz: 0f9a8a1283175f192339f6a48089ff88454ba13fa77f7806bc241fd4299ea1dc834707da8e88f5dad92493e793912d4b6ef8452ba6a68c13cf2ffbb82dadd5fe
+  metadata.gz: 1d883cd8eb0376787c2fe2410c3e2b12b458fe87487436843e09c4f9da7db840ec3757243d3e67118447b6e3d07cecf53e8f334c0fcbccd7ca9c838ed210d520
+  data.tar.gz: 2c949cfabd31d3705a1f5df2604f1d23f8da4286a1dc78bac8ec7af1852f96884ea79276ecbc9a5906fac0b2ec23bce746ffe884993b3c2a5475e4e1348b59bd

data/.ruby-version

@@ -1 +1 @@
-ruby-2.0.0
+ruby-2.1.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    opskeleton (0.4.8)
+    opskeleton (0.5.0)
       bintray_deploy
       thor
 
@@ -13,19 +13,57 @@ GEM
       configuration
       rest-client
       thor
+    chef (11.6.2)
+      erubis (~> 2.7)
+      highline (~> 1.6, >= 1.6.9)
+      json (>= 1.4.4, <= 1.7.7)
+      mixlib-authentication (~> 1.3)
+      mixlib-cli (~> 1.3)
+      mixlib-config (~> 1.1, >= 1.1.2)
+      mixlib-log (~> 1.3)
+      mixlib-shellout (~> 1.1)
+      net-ssh (~> 2.6)
+      net-ssh-multi (~> 1.1.0)
+      ohai (>= 0.6.0, < 7.0.0)
+      rest-client (>= 1.0.4, < 1.7.0)
+      yajl-ruby (~> 1.1)
     coderay (1.1.0)
     configuration (1.3.4)
     diff-lcs (1.2.5)
+    erubis (2.7.0)
     facter (2.0.1)
       CFPropertyList (~> 2.2.6)
     hiera (1.3.2)
       json_pure
+    highline (1.6.21)
+    ipaddress (0.8.0)
+    json (1.7.7)
     json_pure (1.8.1)
     metaclass (0.0.4)
     method_source (0.8.2)
     mime-types (2.2)
+    mixlib-authentication (1.3.0)
+      mixlib-log
+    mixlib-cli (1.5.0)
+    mixlib-config (1.1.2)
+    mixlib-log (1.6.0)
+    mixlib-shellout (1.4.0)
     mocha (1.0.0)
       metaclass (~> 0.0.1)
+    net-ssh (2.9.1)
+    net-ssh-gateway (1.2.0)
+      net-ssh (>= 2.6.5)
+    net-ssh-multi (1.1)
+      net-ssh (>= 2.1.4)
+      net-ssh-gateway (>= 0.99.0)
+    ohai (6.22.0)
+      ipaddress
+      mixlib-cli
+      mixlib-config
+      mixlib-log
+      mixlib-shellout
+      systemu (~> 2.5.2)
+      yajl-ruby
     pry (0.9.12.6)
       coderay (~> 1.0)
       method_source (~> 0.8)
@@ -55,12 +93,15 @@ GEM
     rspec-puppet (1.0.1)
       rspec
     slop (3.5.0)
+    systemu (2.5.2)
     thor (0.19.1)
+    yajl-ruby (1.2.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  chef
   opskeleton!
   pry
   puppet

data/README.md

@@ -35,7 +35,7 @@ Creating out first sandbox
 ```bash
  $ rvm use system 
  # parameters include name vagrant-box
- $ opsk generate redis ubuntu-13.10
+ $ opsk generate_puppet redis ubuntu-13.10
  $ cd redis-sandbox
  $ bundle install 
  $ librarian-puppet install 
@@ -91,7 +91,7 @@ $ rake spec
 Opskelaton fully supports deployment and portable execution of sandboxes on non Vagrant environments:
 
 ```bash
-$ opsk generate foo ubuntu-13.10
+$ opsk generate_puppet foo ubuntu-13.10
 $ cd foo-sandbox
 # The package version file
 $ cat opsk.yaml

data/bin/opsk

@@ -10,7 +10,8 @@ require 'opskeleton'
 module Opsk
   class Root < Thor
 
-    register Opsk::Generate, 'generate', "generate [name] [box]", 'generates opskelaton project structure'
+    register Opsk::GeneratePuppet, 'generate_puppet', "generate_puppet [name] [box]", 'generates a Puppet based project '
+    register Opsk::GenerateChef, 'generate_chef', "generate_chef [name] [box]", 'generates a Chef based project '
     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'
@@ -25,6 +26,7 @@ module Opsk
 end
 
 # not sure that this is the cleanest way
-Opsk::Root.tasks['generate'].options = Opsk::Generate.class_options 
+Opsk::Root.tasks['generate_puppet'].options = Opsk::GeneratePuppet.class_options 
+Opsk::Root.tasks['generate_chef'].options = Opsk::GenerateChef.class_options 
 
 Opsk::Root.start ARGV

data/lib/opskeleton/generate_chef.rb

@@ -0,0 +1,77 @@
+module Opsk 
+  class GenerateChef < Thor::Group
+    include Thorable, Thor::Actions
+
+    argument :name, :type => :string, :desc => 'project name'
+    argument :box, :type => :string, :desc => 'Vagrant box type'
+    class_option :box_url, :type=> :string, :desc => 'vagrant box url'
+    class_option :os_type, :type=> :string, :desc => 'Operating system type (bsd/linux)'
+
+    desc 'Generate a Vagrant, Chef librarian and fpm project'
+
+    def path 
+	"#{name}-sandbox"
+    end
+
+    def create_vagrant_file
+	empty_directory(path)
+	template('templates/chef/vagrant.erb', "#{path}/Vagrantfile")
+    end
+
+    def create_gemfile
+	copy_file('templates/chef/gemfile', "#{path}/Gemfile")
+    end
+
+    def create_rakefile
+	copy_file('templates/Rakefile', "#{path}/Rakefile")
+    end
+
+    def create_version
+	template('templates/opsk.yml', "#{path}/opsk.yml")
+    end
+
+    def create_rvmrc
+	remove_file("#{path}/.rvmrc")
+	template('templates/ruby-gemset.erb', "#{path}/.ruby-gemset")
+	template('templates/ruby-version.erb', "#{path}/.ruby-version")
+    end
+
+    def create_chef_base
+	empty_directory("#{path}/static-cookbooks/")
+	copy_file('templates/chef/Cheffile', "#{path}/Cheffile")
+      empty_directory("#{path}/roles/")
+	template('templates/chef/roles.erb', "#{path}/roles/#{name}.rb")
+	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")
+	chmod("#{path}/run.sh", 0755)
+	chmod("#{path}/boot.sh", 0755)
+    end
+
+    def readme
+	template('templates/README.erb', "#{path}/README.md")
+	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 server_spec
+	directory('templates/parent/spec', "#{path}/spec")
+    end
+
+    def git
+	if(!File.exists?("#{path}/.git"))
+	  copy_file('templates/gitignore', "#{path}/.gitignore")
+	  inside(path) do
+	    run('git init .')
+	    run('git add -A')
+	    run("git commit -m 'initial sandbox import'")
+	  end
+	end
+    end
+
+  end
+end

data/lib/opskeleton/{generate.rb → generate_puppet.rb}

@@ -1,5 +1,5 @@
 module Opsk 
-  class Generate < Thor::Group
+  class GeneratePuppet < Thor::Group
     include Thorable, Thor::Actions
 
     argument :name, :type => :string, :desc => 'project name'

data/lib/opskeleton/version.rb

@@ -1,3 +1,3 @@
 module Opskeleton
-  VERSION = '0.4.9'
+  VERSION = '0.5.0'
 end

data/lib/opskeleton.rb

@@ -7,7 +7,8 @@ require 'opskeleton/thorable'
 require 'opskeleton/package'
 require 'opskeleton/clean'
 require 'opskeleton/bump'
-require 'opskeleton/generate'
+require 'opskeleton/generate_puppet'
+require 'opskeleton/generate_chef'
 require 'opskeleton/deploy'
 require 'opskeleton/module'
 

data/opskeleton.gemspec

@@ -14,6 +14,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency('thor')
   gem.add_dependency('bintray_deploy')
   gem.add_development_dependency('puppet')
+  gem.add_development_dependency('chef')
   gem.add_development_dependency('rspec-puppet')
   gem.add_development_dependency('puppetlabs_spec_helper', '>= 0.1.0')
   gem.add_development_dependency('pry')

data/templates/chef/Cheffile

@@ -0,0 +1,3 @@
+site 'http://community.opscode.com/api/v1'
+
+cookbook 'apt'

data/templates/chef/dna.json.erb

@@ -0,0 +1,5 @@
+{
+  "run_list": [
+    "role[<%=name%>]"
+  ]
+}

data/templates/chef/gemfile

@@ -0,0 +1,14 @@
+source "https://rubygems.org"
+
+# base
+gem 'chef'
+
+# testing
+gem 'serverspec'
+gem 'test-kitchen'
+
+# build 
+gem 'rake'
+gem 'foodcritic'
+gem 'librarian-chef'
+gem 'opskeleton'

data/templates/chef/gitignore

@@ -0,0 +1,5 @@
+cookbooks
+.vagrant
+.librarian
+.tmp
+pkg

data/templates/chef/roles.erb

@@ -0,0 +1,2 @@
+
+run_list()

data/templates/chef/run.sh

@@ -0,0 +1 @@
+chef-solo -c solo.rb -j dna.json

data/templates/chef/solo.rb

@@ -0,0 +1,5 @@
+file_cache_path "#{Dir.pwd}/chef"
+cookbook_path ["#{Dir.pwd}/cookbooks","#{Dir.pwd}/static-cookbooks"]
+role_path "#{Dir.pwd}/roles/"
+log_level :info
+log_location STDOUT

data/templates/chef/vagrant.erb

@@ -0,0 +1,25 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+Vagrant.configure("2") do |config|
+
+  bridge = ENV['VAGRANT_BRIDGE']
+  bridge ||= 'eth0'
+  env  = ENV['PUPPET_ENV']
+  env ||= 'dev'
+
+  config.vm.box = '<%=box%>' <%if(options['box_url']) %>
+  <%="config.vm.box_url = '#{options['box_url']}'"%> <%end%>
+  config.vm.network :public_network, :bridge => bridge
+  config.vm.hostname = '<%=name%>.local'
+
+  config.vm.provider :virtualbox do |vb|
+    vb.customize ['modifyvm', :id, '--memory', 2048, '--cpus', 2]
+  end
+
+  config.vm.provision :chef_solo do |chef|
+    chef.cookbooks_path = ['static-cookbooks', 'cookbooks']
+    chef.roles_path = 'roles'
+    chef.add_role('<%=name%>')
+  end
+
+end

data/test/chef_package_test.rb

@@ -0,0 +1,34 @@
+$LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
+
+require 'minitest/autorun'
+require_relative 'test_helper'
+require 'fileutils'
+
+class ChefPackageTest < MiniTest::Unit::TestCase
+  include FileUtils
+
+  def setup
+    Opsk::Root.start ['generate_chef', 'foo', 'bar']
+  end
+
+  def teardown 
+    rm_rf 'foo-sandbox'
+  end
+
+  def with_cwd(dir)
+    Dir.chdir dir do
+	yield  
+    end
+  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/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/dna.json')
+   assert File.exists?('foo-sandbox/pkg/foo-sandbox-0.0.1.tar.gz')
+  end
+
+end

data/test/generate_test.rb

@@ -8,7 +8,7 @@ class GenerateTest< MiniTest::Unit::TestCase
   include FileUtils
 
   def setup
-    Opsk::Root.start ['generate', 'foo', 'bar']
+    Opsk::Root.start ['generate_puppet', 'foo', 'bar']
   end
 
   def teardown 

data/test/{package_test.rb → puppet_package_test.rb}

@@ -4,18 +4,18 @@ require 'minitest/autorun'
 require_relative 'test_helper'
 require 'fileutils'
 
-class PackageTest < MiniTest::Unit::TestCase
+class PuppetPackageTest < MiniTest::Unit::TestCase
   include FileUtils
 
   def setup
-    Opsk::Root.start ['generate', 'foo', 'bar']
+    Opsk::Root.start ['generate_puppet', 'foo', 'bar']
   end
 
   def teardown 
     rm_rf 'foo-sandbox'
   end
 
-  def with_cwd dir
+  def with_cwd(dir)
     Dir.chdir dir do
 	yield  
     end

data/test/test_helper.rb

@@ -6,7 +6,8 @@ require 'opskeleton'
 
 module Opsk
   class Root < Thor
-    register Opsk::Generate, 'generate', 'generate [name] [box]', 'generates opskelaton project structure'
+    register Opsk::GeneratePuppet, 'generate_puppet', 'generate_puppet [name] [box]', 'generates opskelaton project structure'
+    register Opsk::GenerateChef, 'generate_chef', 'generate_chef [name] [box]', 'generates opskelaton project structure'
     register Opsk::Package, 'package', 'package', 'packages current module for celestial'
 
     end 

metadata

@@ -1,97 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: opskeleton
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.5.0
 platform: ruby
 authors:
 - narkisr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-28 00:00:00.000000000 Z
+date: 2014-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bintray_deploy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: puppet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: chef
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-puppet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: puppetlabs_spec_helper
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A generator for ops projects that include vagrant puppet and fpm
@@ -102,10 +116,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .ruby-gemset
-- .ruby-version
-- .travis.yml
+- ".gitignore"
+- ".ruby-gemset"
+- ".ruby-version"
+- ".travis.yml"
 - CHANGES.md
 - Gemfile
 - Gemfile.lock
@@ -119,7 +133,8 @@ files:
 - lib/opskeleton/bump.rb
 - lib/opskeleton/clean.rb
 - lib/opskeleton/deploy.rb
-- lib/opskeleton/generate.rb
+- lib/opskeleton/generate_chef.rb
+- lib/opskeleton/generate_puppet.rb
 - lib/opskeleton/module.rb
 - lib/opskeleton/package.rb
 - lib/opskeleton/thorable.rb
@@ -129,6 +144,14 @@ files:
 - templates/README.erb
 - templates/Rakefile
 - templates/boot.sh
+- templates/chef/Cheffile
+- templates/chef/dna.json.erb
+- templates/chef/gemfile
+- templates/chef/gitignore
+- templates/chef/roles.erb
+- templates/chef/run.sh
+- templates/chef/solo.rb
+- templates/chef/vagrant.erb
 - templates/clean.yaml
 - templates/gemfile
 - templates/gitignore
@@ -151,8 +174,9 @@ files:
 - templates/spec.erb
 - templates/vagrant.erb
 - templates/vagrant_bsd.erb
+- test/chef_package_test.rb
 - test/generate_test.rb
-- test/package_test.rb
+- test/puppet_package_test.rb
 - test/test_helper.rb
 homepage: https://github.com/narkisr/opskeleton
 licenses: []
@@ -163,21 +187,22 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 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/package_test.rb
+- test/puppet_package_test.rb
 - test/test_helper.rb