opskeleton 0.1.9 → 0.2.0

data/.ruby-gemset

@@ -0,0 +1 @@
+opskeleton

data/.ruby-version

@@ -0,0 +1 @@
+ruby-1.9.3-p392

data/CHANGES.md

@@ -0,0 +1,7 @@
+# Changes to opskeleton in version 0.2.0
+
+* Moving to Vagrant 1.1, vagrant to be installed from package and not from gem
+
+* Moving to Vagrant latest configuration format
+
+* Moving to .ruby-version .ruby-gemset instead of .rvmrc, bundle will not run automatically

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    opskeleton (0.1.6)
+    opskeleton (0.2.0)
       thor
 
 GEM
@@ -14,7 +14,7 @@ GEM
       method_source (~> 0.8)
       slop (~> 3.4)
     slop (3.4.4)
-    thor (0.17.0)
+    thor (0.18.1)
 
 PLATFORMS
   ruby

data/LICENSE-2.0.txt

@@ -0,0 +1,177 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS

data/README.md

@@ -24,6 +24,11 @@ Installing perquisites (on Ubuntu)
  $ sudo aptitude install ruby1.9.1 ruby1.9.1-dev
  # see https://rvm.io/rvm/install/
  $ curl -L https://get.rvm.io | bash -s stable --ruby
+
+ # install vagrant [see](http://docs-v1.vagrantup.com/v1/docs/getting-started/) for latest package
+ $ wget http://files.vagrantup.com/packages/64e360814c3ad960d810456add977fd4c7d47ce6/vagrant_x86_64.deb
+ $ sudo dpkg -i vagrant_x86_64.deb
+
  # re-launch current terminal session, the following should work
  $ rvm use system
  $ sudo gem install opskeleton
@@ -62,4 +67,18 @@ Life cycle scheme:
 
 <img src="https://raw.github.com/narkisr/vagrant-sketching-board/master/images/module-lifecycle-black.png" width='30%' hight='50%'  alt="" />
 
+# Copyright and license
+
+Copyright [2013] [Ronen Narkis]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+  [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
 
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

data/autocomplete/opsk_bash_completion

@@ -0,0 +1,19 @@
+_opsk() {
+     local cur prev opts
+     COMPREPLY=()
+     cur="${COMP_WORDS[COMP_CWORD]}"
+     prev="${COMP_WORDS[COMP_CWORD-1]}"
+     opts="generate help package specgen version"
+ 
+     if [[ ${cur} == -* || ${COMP_CWORD} -eq 1 ]] ; then
+         COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
+         return 0
+     fi
+
+     case "${prev}" in
+          help)
+                COMPREPLY=( $(compgen -W "${opts/help/}" -- ${cur}) )
+          ;;
+     esac    
+    }
+complete -F _opsk opsk

data/bin/opsk

@@ -3,6 +3,7 @@
 $:.push 'lib'
 require 'rubygems'
 require 'thor'
+require 'thor/runner'
 require 'thor/group'
 require 'opskeleton'
 
@@ -36,7 +37,8 @@ end
 
 module Opsk
   class Root < Thor
-    register Opsk::Generate, 'generate', 'generate [name] [box]', 'generates opskelaton project structure'
+
+    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::Package, 'package', 'package', 'packages current module for celestial'
 
@@ -47,4 +49,7 @@ module Opsk
   end 
 end
 
+# not sure that this is the cleanest way
+Opsk::Root.tasks['generate'].options = Opsk::Generate.class_options 
+
 Opsk::Root.start ARGV

data/lib/opskeleton/generate.rb

@@ -2,10 +2,11 @@ module Opsk
   class Generate < Thor::Group
     include Thorable, Thor::Actions
 
-    argument :name, :type => :string, :desc => "project name"
-    argument :box, :type => :string, :desc => "Vagrant box type"
+    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'
 
-    desc "Generate a Vagrant, Puppet librarian and fpm project"
+    desc 'Generate a Vagrant, Puppet librarian and fpm project'
 
     def path 
 	"#{name}-sandbox"
@@ -29,7 +30,9 @@ module Opsk
     end
 
     def create_rvmrc
-	template('templates/rvmrc.erb', "#{path}/.rvmrc")
+	remove_file("#{path}/.rvmrc")
+	template('templates/ruby-gemset.erb', "#{path}/.ruby-gemset")
+	template('templates/ruby-version.erb', "#{path}/.ruby-version")
     end
 
     def create_puppet_base
@@ -57,11 +60,13 @@ module Opsk
     end
 
     def git
-	copy_file('templates/gitignore', "#{path}/.gitignore")
-	inside(path) do
-	  run('git init .')
-	  run('git add -A')
-	  run("git commit -m 'initial sandbox import'")
+	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

data/lib/opskeleton/version.rb

@@ -1,3 +1,3 @@
 module Opskeleton
-  VERSION = "0.1.9"
+  VERSION = "0.2.0"
 end

data/templates/README.erb

@@ -1,5 +1,5 @@
 # Intro 
-This project manages a sandbox for <%=name%> 
+This project manages a sandbox for [<%=name%>](url)
 
 # Usage
 ```bash
@@ -7,3 +7,20 @@ This project manages a sandbox for <%=name%>
   $ librarian-puppet install 
   $ vagrant up
 ```
+
+# Copyright and license
+
+Copyright [<%=Time.now.strftime("%Y")%>] [First Last Name]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+
+You may obtain a copy of the License at:
+
+  [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

data/templates/gemfile

@@ -1,7 +1,6 @@
 # opskelaton Gems
 source "https://rubygems.org"
 
-gem 'vagrant', '>=1.0.5'
 gem 'puppet'
 gem 'puppet-lint'
 gem 'librarian-puppet'

data/templates/ruby-gemset.erb

@@ -0,0 +1 @@
+<%=name%>-sandbox

data/templates/ruby-version.erb

@@ -0,0 +1 @@
+ruby-1.9.3

data/templates/vagrant.erb

@@ -1,17 +1,21 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
+Vagrant.configure("2") do |config|
 
-Vagrant::Config.run do |config|
+  config.vm.box = '<%=box%>' <%if(options['box_url']) %>
+  <%="config.vm.box_url = '#{options['box_url']}'"%> <%end%>
+  config.vm.network :public_network
+  config.vm.hostname = '<%=name%>.local'
+
+  config.vm.provider :virtualbox do |vb|
+    vb.customize ['modifyvm', :id, '--memory', 2048, '--cpus', 2]
+  end
+
+  config.vm.provision :puppet do |puppet|
+    puppet.manifests_path = 'manifests'
+    puppet.manifest_file  = 'default.pp'
+    puppet.options = '--modulepath=/vagrant/modules:/vagrant/static-modules --hiera_config /vagrant/hiera.yaml'
 
-  config.vm.define :<%= name%> do |<%= name%>|
-    <%= name%>.vm.box = '<%= box %>'
-    <%= name%>.vm.network :bridged
-    <%= name%>.vm.customize ['modifyvm', :id, '--memory', 2048, '--cpus', 4]
-    <%= name%>.vm.host_name = '<%= name %>'
-    <%= name%>.vm.provision :puppet, :options => ["--modulepath=/vagrant/modules:/vagrant/static-modules", "--hiera_config /vagrant/hiera.yaml"]<% if(box.include?('centos')) %>
-    # https://github.com/mitchellh/vagrant/issues/713
-    config.vm.customize ['setextradata', :id, 'VBoxInternal2/SharedFoldersEnableSymlinksCreate/v-root', '1']
-  <% end %>
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opskeleton
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-15 00:00:00.000000000 Z
+date: 2013-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -52,12 +52,16 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- .rvmrc
+- .ruby-gemset
+- .ruby-version
+- CHANGES.md
 - Gemfile
 - Gemfile.lock
+- LICENSE-2.0.txt
 - README.md
 - Rakefile
 - TODOS
+- autocomplete/opsk_bash_completion
 - bin/opsk
 - lib/opskeleton.rb
 - lib/opskeleton/generate.rb
@@ -76,8 +80,9 @@ files:
 - templates/puppet/default.erb
 - templates/puppet/site.erb
 - templates/puppetfile.erb
+- templates/ruby-gemset.erb
+- templates/ruby-version.erb
 - templates/run.sh
-- templates/rvmrc.erb
 - templates/scripts/lookup.rb
 - templates/scripts/run.sh
 - templates/spec.erb

data/.rvmrc

@@ -1 +0,0 @@
-rvm use ruby-1.9.3@opskelaton --create

data/templates/rvmrc.erb

@@ -1,31 +0,0 @@
-#!/usr/bin/env bash
-
-ruby_string="ruby-1.9.3"
-gemset_name="<%=path%>"
-
-if rvm list strings | grep -q "${ruby_string}" ; then
-
-  # Load or create the specified environment
-  if [[ -d "${rvm_path:-$HOME/.rvm}/environments" \
-    && -s "${rvm_path:-$HOME/.rvm}/environments/${ruby_string}@${gemset_name}" ]] ; then
-    \. "${rvm_path:-$HOME/.rvm}/environments/${ruby_string}@${gemset_name}"
-  else
-    rvm --create  "${ruby_string}@${gemset_name}"
-  fi
-
-  (
-    # Ensure that Bundler is installed, install it if it is not.
-    if ! command -v bundle ; then
-      gem install bundler
-    fi
-
-    # Bundle while redcing excess noise.
-    bundle | grep -v 'Using' | grep -v 'complete' | sed '/^$/d'
-  )&
-
-else
-
-  # Notify the user to install the desired interpreter before proceeding.
-  echo "${ruby_string} was not found, please run 'rvm install ${ruby_string}' and then cd back into the project directory."
-
-fi