opskeleton 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61a6c17c3ba3716f2f48bf9ac47a2661341758f8
-  data.tar.gz: 37ef71a30853f719787da9d02054b6fecb7158c6
+  metadata.gz: 67c2e570a9a06828f6c0f8eb9a94addc4ba0f46b
+  data.tar.gz: 6b84d057ac2661d98756f7da999046138c1b525e
 SHA512:
-  metadata.gz: f34f7a8a9643b93bb959d44a2d16dcc4de664a177961c8804e14bd706477cc360c1658cdd775809cf35c062fcbf05737dc2cb8d81faf3604eb7f2a3ff9ce9f63
-  data.tar.gz: 48f52de59bc88cb2a69f718b52e5592f0453dc943161cfc81d7c57c9329bf1bf6d967be251a024b114d29b5ddd973e690cfa8c1c337cbb8d353a69ea00e7b5ac
+  metadata.gz: 193f9cc34d66c018e8a87c61fadc0c48202647575980b3270adf3e1df983107af2b2f24a0bc2de8b40a2be1c857001c462ef236f4fa7ad4769207148d40f3d53
+  data.tar.gz: bf57906145847a13d6d6171599fb6a75129651cb815c8c89dab00e4fb362de8d65f38f5eed0fa04236b339f48bca309af41a75a189a8b293de8ebc33260a587c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    opskeleton (0.8.3)
+    opskeleton (0.8.4)
       bintray_deploy
       thor
 

data/lib/opskeleton/bump.rb

@@ -4,6 +4,11 @@ module  Opsk
 
     argument :version, :type => :string, :desc => 'new version number'
 
+    def validate
+	check_root
+    end
+
+
     def meta 
 	 OpenStruct.new(YAML.load_file('opsk.yaml'))
     end

data/lib/opskeleton/clean.rb

@@ -2,12 +2,17 @@ module  Opsk
   class Clean < Thor::Group
     include Thorable, Thor::Actions
 
+    def validate
+	check_root
+    end
+
+
     def meta 
-	 OpenStruct.new(YAML.load_file('opsk.yaml'))
+	OpenStruct.new(YAML.load_file('opsk.yaml'))
     end
 
     def name 
-     	File.basename(Dir.getwd)
+	File.basename(Dir.getwd)
     end
 
     def cleanup

data/lib/opskeleton/deploy.rb

@@ -7,6 +7,11 @@ module  Opsk
 
     desc 'Deploy sandbox into bintray.com'
 
+    def validate
+	check_root
+    end
+
+
     def upload
 	require 'bintray_deploy'
 	pkg = Opsk::Package.new

data/lib/opskeleton/dockerize.rb

@@ -8,6 +8,11 @@ module Opsk
 
     desc 'Creates a docker image using the current opsk sandbox'
 
+    def validate
+	check_root
+    end
+
+
     def create_dockerfiles
 	empty_directory('dockerfiles')
 	machines.each {|m|

data/lib/opskeleton/module.rb

@@ -6,6 +6,11 @@ module Opsk
 
     desc 'Generate an rspec enabled Puppet module'
 
+    def validate
+	check_root
+    end
+
+
     def create_module
 	inside('static-modules') do
 	  run("puppet module generate puppet-#{name}")

data/lib/opskeleton/package.rb

@@ -4,6 +4,10 @@ module  Opsk
   class Package < Thor::Group
     include Thorable, Thor::Actions
 
+    def validate
+	check_root
+    end
+
     def create_build
 	empty_directory(artifact_path)
 	path = Dir.getwd

data/lib/opskeleton/thorable.rb

@@ -42,5 +42,11 @@ module Opsk
 	machines.split('\n').collect {|line| line.split(',')[1]}.find_all{|v| v}
     end
 
+    def check_root
+	unless File.exist?("#{Dir.pwd}/opsk.yaml")
+	  say('Please run from the root folder of an opskeleton project',:red) 
+	  exit(1)
+	end
+    end
   end
 end

data/lib/opskeleton/version.rb

@@ -1,3 +1,3 @@
 module Opskeleton
-  VERSION = '0.8.3'
+  VERSION = '0.8.4'
 end

data/templates/puppet/vagrant.erb

@@ -33,21 +33,21 @@ Vagrant.configure("2") do |config|
     node.ssh.username = 'ubuntu'
 
     node.vm.provider :openstack do |os|
-      os.openstack_auth_url = 'http://hostname/tokens'
-      os.username           = AUTH['user']
-      os.password           = AUTH['pass']
-      os.tenant_name        = ''
-      os.flavor             = 'm1.small'
-      os.image              = ''
-      os.floating_ip_pool   = ''
+	os.openstack_auth_url = 'http://hostname/tokens'
+	os.username           = config.configuration.os_username
+	os.password           = config.configuration.os_password
+	os.tenant_name        = ''
+	os.flavor             = 'm1.small'
+	os.image              = ''
+	os.floating_ip_pool   = ''
     end
-<%end -%>
- 
+    <%end -%>
+
     node.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_vagrant.yaml --environment=#{env}"
-  
+	puppet.manifests_path = 'manifests'
+	puppet.manifest_file  = 'default.pp'
+	puppet.options = "--modulepath=/vagrant/modules:/vagrant/static-modules --hiera_config /vagrant/hiera_vagrant.yaml --environment=#{env}"
+
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opskeleton
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors:
 - narkisr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-25 00:00:00.000000000 Z
+date: 2015-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor