opskeleton 0.0.5 → 0.1.0

data/Gemfile.lock

@@ -1,10 +1,12 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    thor (0.16.0)
+    map (6.3.0)
+    thor (0.17.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  map
   thor

data/Rakefile

@@ -1 +1,8 @@
 require "bundler/gem_tasks"
+
+require 'rake/testtask'
+
+Rake::TestTask.new do |t|
+    t.pattern = "test/*_test.rb"
+    t.verbose = true
+end

data/bin/opsk

@@ -4,42 +4,9 @@ $:.push 'lib'
 require 'rubygems'
 require 'thor'
 require 'thor/group'
-require 'opskeleton/version'
-
-module  Opsk 
-  class Package < Thor::Group
-    include Thor::Actions
-
-    def self.source_root
-	# during dev time
-	if(File.dirname(__FILE__) == './bin')
-	  File.dirname('.')
-	else 
-	  "#{File.dirname(__FILE__)}/../"
-	end
-    end
-
-    def create_pkg
-       empty_directory('pkg')
-    end
-
-    def create_scripts
-	empty_directory('scripts')
-	template('templates/scripts/lookup.sh', "scripts/lookup.sh")
-	template('templates/scripts/run.sh', "scripts/run.sh")
-    end
-
-    def package
-      name = File.basename(Dir.getwd)
-      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/#{name}.tar.gz ../#{name} > /dev/null", :verbose => false)
-    end
-
-  end
-
+require 'opskeleton'
 
+module Opsk
   class Specgen < Thor::Group
     include Thor::Actions
 
@@ -63,80 +30,6 @@ module  Opsk
     def create_class_spec
 	template('templates/spec.erb', "static-modules/#{name}/spec/classes/")
     end
-
-  end
-
-  class Generate < Thor::Group
-    include Thor::Actions
-
-    argument :name, :type => :string, :desc => "project name"
-    argument :box, :type => :string, :desc => "Vagrant box type"
-
-    desc "Generate a Vagrant, Puppet librarian and fpm project"
-
-
-    def self.source_root
-	# during dev time
-	if(File.dirname(__FILE__) == './bin')
-	  File.dirname('.')
-	else 
-	  "#{File.dirname(__FILE__)}/../"
-	end
-    end
-
-    def path 
-	"#{name}-sandbox"
-    end
-
-    def create_vagrant_file
-	empty_directory(path)
-	template('templates/vagrant.erb', "#{path}/Vagrantfile")
-    end
-
-    def create_gemfile
-	copy_file('templates/gemfile', "#{path}/Gemfile")
-    end
-
-    def create_rakefile
-	copy_file('templates/Rakefile', "#{path}/Rakefile")
-    end
-
-    def create_rvmrc
-	template('templates/rvmrc.erb', "#{path}/.rvmrc")
-    end
-
-    def create_puppet_base
-	empty_directory("#{path}/static-modules/")
-	empty_directory("#{path}/manifests/")
-	template('templates/puppetfile.erb', "#{path}/Puppetfile")
-	template('templates/default.erb', "#{path}/manifests/default.pp")
-	copy_file('templates/run.sh', "#{path}/run.sh")
-	chmod("#{path}/run.sh", 0755)
-    end
-
-    def create_heira
-	hieradata = "#{path}/hieradata/"
-	empty_directory(hieradata)
-	%w(common virtualbox physical).each do |env|
-	  copy_file('templates/clean.yaml', "#{hieradata}/#{env}.yaml")
-	end
-
-	copy_file('templates/hiera.yaml', "#{path}/hiera.yaml")
-    end
-
-    def readme
-	template('templates/README.erb', "#{path}/README.md")
-	copy_file('templates/LICENSE-2.0.txt',"#{path}/LICENSE-2.0.txt")
-    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'")
-	end
-    end
   end
 end
 

data/lib/opskeleton/generate.rb

@@ -0,0 +1,68 @@
+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"
+
+    desc "Generate a Vagrant, Puppet librarian and fpm project"
+
+    def path 
+	"#{name}-sandbox"
+    end
+
+    def create_vagrant_file
+	empty_directory(path)
+	template('templates/vagrant.erb', "#{path}/Vagrantfile")
+    end
+
+    def create_gemfile
+	copy_file('templates/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
+	template('templates/rvmrc.erb', "#{path}/.rvmrc")
+    end
+
+    def create_puppet_base
+	empty_directory("#{path}/static-modules/")
+	empty_directory("#{path}/manifests/")
+	template('templates/puppetfile.erb', "#{path}/Puppetfile")
+	template('templates/default.erb', "#{path}/manifests/default.pp")
+	copy_file('templates/run.sh', "#{path}/run.sh")
+	chmod("#{path}/run.sh", 0755)
+    end
+
+    def create_heira
+	hieradata = "#{path}/hieradata/"
+	empty_directory(hieradata)
+	%w(common virtualbox physical).each do |env|
+	  copy_file('templates/clean.yaml', "#{hieradata}/#{env}.yaml")
+	end
+
+	copy_file('templates/hiera.yaml', "#{path}/hiera.yaml")
+    end
+
+    def readme
+	template('templates/README.erb', "#{path}/README.md")
+	copy_file('templates/LICENSE-2.0.txt',"#{path}/LICENSE-2.0.txt")
+    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'")
+	end
+    end
+  end
+end

data/lib/opskeleton/package.rb

@@ -0,0 +1,46 @@
+module  Opsk
+  class Package < Thor::Group
+    include Thorable, Thor::Actions
+
+    def meta 
+	 OpenStruct.new(YAML.load_file('opsk.yml'))
+    end
+
+    def name 
+     	File.basename(Dir.getwd)
+    end
+
+    def artifact
+    	"#{name}-#{meta.version}"
+    end
+
+    def create_build
+	empty_directory(artifact)
+	path = File.basename(Dir.getwd)
+	directory path , artifact
+    end
+
+    def create_pkg
+	empty_directory('pkg')
+    end
+
+    def create_scripts
+	empty_directory('scripts')
+	%w(lookup.sh run.sh).each  do |s|
+	  template("templates/scripts/#{s}", "scripts/#{s}")
+	  chmod("scripts/#{s}", 0755)
+	end
+
+    end
+
+    def package
+	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)
+    end
+
+  end
+
+end
+

data/lib/opskeleton/thorable.rb

@@ -0,0 +1,14 @@
+module Opsk 
+  module Thorable
+    def self.included klass
+	def klass.source_root
+	  # during dev time
+	  if(File.dirname(__FILE__) == './bin')
+	    File.dirname('.')
+	  else 
+	    "#{File.dirname(__FILE__)}/../../"
+	  end
+	end
+    end
+  end
+end

data/lib/opskeleton/version.rb

@@ -1,3 +1,3 @@
 module Opskeleton
-  VERSION = "0.0.5"
+  VERSION = "0.1.0"
 end

data/lib/opskeleton.rb

@@ -1,5 +1,9 @@
-require "opskeleton/version"
+require 'opskeleton/version'
+require 'thor'
+require 'thor/group'
+require 'yaml'
+require 'ostruct'
+require 'opskeleton/thorable'
+require 'opskeleton/package'
+require 'opskeleton/generate'
 
-module Opskeleton
-  # Your code goes here...
-end

data/templates/opsk.yml

@@ -0,0 +1,3 @@
+--- 
+  version: '0.0.1'
+  name: <%= name %>

data/templates/scripts/lookup.sh

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

data/test/generate_test.rb

@@ -0,0 +1,22 @@
+$LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
+
+require 'minitest/autorun'
+require_relative 'test_helper'
+require 'fileutils'
+
+class GenerateTest< MiniTest::Unit::TestCase
+  include FileUtils
+
+  def setup
+    Opsk::Root.start ['generate', 'foo', 'bar']
+  end
+
+  def teardown 
+    rm_rf 'foo-sandbox'
+  end
+
+  def test_version
+    assert File.exists?('foo-sandbox/opsk.yml')
+  end
+
+end

data/test/package_test.rb

@@ -0,0 +1,30 @@
+$LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
+
+require 'minitest/autorun'
+require_relative 'test_helper'
+require 'fileutils'
+
+class PackageTest < MiniTest::Unit::TestCase
+  include FileUtils
+
+  def setup
+    Opsk::Root.start ['generate', 'foo', 'bar']
+  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/foo-sandbox-0.0.1/Puppetfile')
+
+   assert File.exists?('foo-sandbox/pkg/foo-sandbox-0.0.1.tar.gz')
+  end
+
+end

data/test/test_helper.rb

@@ -0,0 +1,14 @@
+require 'rubygems'
+require 'thor'
+require 'thor/group'
+require 'opskeleton'
+
+
+module Opsk
+  class Root < Thor
+    register Opsk::Generate, 'generate', 'generate [name] [box]', 'generates opskelaton project structure'
+    register Opsk::Package, 'package', 'package', 'packages current module for celestial'
+
+    end 
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opskeleton
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -44,6 +44,9 @@ files:
 - TODOS
 - bin/opsk
 - lib/opskeleton.rb
+- lib/opskeleton/generate.rb
+- lib/opskeleton/package.rb
+- lib/opskeleton/thorable.rb
 - lib/opskeleton/version.rb
 - opskeleton.gemspec
 - templates/LICENSE-2.0.txt
@@ -54,6 +57,7 @@ files:
 - templates/gemfile
 - templates/gitignore
 - templates/hiera.yaml
+- templates/opsk.yml
 - templates/puppetfile.erb
 - templates/run.sh
 - templates/rvmrc.erb
@@ -61,6 +65,9 @@ files:
 - templates/scripts/run.sh
 - templates/spec.erb
 - templates/vagrant.erb
+- test/generate_test.rb
+- test/package_test.rb
+- test/test_helper.rb
 homepage: https://github.com/narkisr/opskeleton
 licenses: []
 post_install_message: 
@@ -85,4 +92,7 @@ rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A generator for ops projects that include vagrant puppet and fpm
-test_files: []
+test_files:
+- test/generate_test.rb
+- test/package_test.rb
+- test/test_helper.rb