opskeleton 0.9.8 → 0.9.9

data/lib/opskeleton.rb

@@ -6,12 +6,10 @@ require 'yaml'
 require 'ostruct'
 require 'git'
 require 'opskeleton/thorable'
-require 'opskeleton/dockerize'
 require 'opskeleton/package'
 require 'opskeleton/clean'
 require 'opskeleton/bump'
 require 'opskeleton/generate_puppet'
-require 'opskeleton/generate_chef'
 require 'opskeleton/deploy_bintray'
 require 'opskeleton/deploy_s3'
 require 'opskeleton/deploy_scp'
@@ -20,4 +18,6 @@ require 'opskeleton/commit'
 require 'opskeleton/uncommited'
 require 'opskeleton/push'
 require 'opskeleton/git'
+require 'opskeleton/update'
+require 'opskeleton/analyze'
 

data/lib/opskeleton/analyze.rb

@@ -0,0 +1,18 @@
+
+module  Opsk
+  class Analyze < Thor::Group
+    include Thorable, Thor::Actions
+
+    argument :file, :type => :string, :desc => 'the puppet log input file'
+    class_option :threshold, :type=> :string, :desc => 'minimum run time filter'
+
+    def report
+	threshold = options['threshold'] || '0.01'
+	rs = File.readlines(file).find_all{|line| line.include?('Evaluated')}
+	top = rs.collect {|r| r.split(' ').values_at(3 , 7)}.find_all{|r| r[1].to_f > threshold.to_f}
+	top.sort_by{|r| r[1].to_f}.reverse.each {|r|
+        say("#{r[0]} #{r[1]}")
+	}
+    end
+  end
+end

data/lib/opskeleton/clean.rb

@@ -17,14 +17,6 @@ module  Opsk
 
     def cleanup
 	remove_dir('pkg')
-	if(File.exists?('dockerfiles'))
-	  images = Dir['dockerfiles/*'].select{|file| File.ftype(file) == 'directory'}
-	  images.each do |path|
-	    if(File.ftype(path) == 'directory')
-		remove_dir("#{path}/pkg")
-	    end
-	  end
-	end
     end
 
   end

data/lib/opskeleton/package.rb

@@ -14,7 +14,7 @@ module  Opsk
 	meta.includes.each {|f| 
 	  if(File.directory?("#{path}/#{f}"))
 	    directory "#{path}/#{f}", "#{artifact_path}/#{f}", :verbose => false
-	  elsif(File.exists?("#{path}/#{f}"))
+	  elsif(File.exist?("#{path}/#{f}"))
 	    copy_file "#{path}/#{f}", "#{artifact_path}/#{f}"
 	  else
 	    raise Exception.new("#{f} not found please validate opks.yaml includes section")
@@ -23,16 +23,16 @@ module  Opsk
 
 	meta.excludes.each {|f| remove_file("#{artifact_path}/#{f}") } if(meta.excludes)
 
-	unless(File.exists?("#{artifact_path}/manifests/site.pp"))
+	unless(File.exist?("#{artifact_path}/manifests/site.pp"))
 	  template('templates/puppet/site.erb', "#{artifact_path}/manifests/site.pp")
 	end
     end
 
     def scripts
 	empty_directory("#{artifact_path}/scripts")
-	files = {:puppet => %w(lookup.rb run.sh) , :chef => [] }
+	files = {:puppet => %w(lookup.rb run.sh) }
 	files[type_of].each  do |s|
-	  unless(File.exists?("#{artifact_path}/scripts/#{s}"))
+	  unless(File.exist?("#{artifact_path}/scripts/#{s}"))
 	    template("templates/#{type_of}/scripts/#{s}", "#{artifact_path}/scripts/#{s}")
 	    chmod("#{artifact_path}/scripts/#{s}", 0755)
 	  end
@@ -42,7 +42,6 @@ module  Opsk
     def package
 	ignored = IO.readlines('.gitignore').map(&:chomp)
 	ignored.delete('modules')
-	ignored.delete('cookbooks')
 	ignored = ignored.select {|ig| !meta.includes.include?(ig)}
 	excludes = ignored.map{|f| "'#{f}'"}.join(" --exclude=") << ' --exclude-backups --exclude-vcs --exclude=pkg'
 	tar = "#{artifact}.tar.gz"
@@ -53,19 +52,6 @@ module  Opsk
 
     end
 
-    def dockercopy
-	tar = "#{artifact}.tar.gz"
-	if(File.exists?('dockerfiles'))
-	  images = Dir['dockerfiles/*'].select{|file| File.ftype(file) == 'directory'}
-	  images.each do |path|
-	    if(File.ftype(path) == 'directory')
-		empty_directory "#{path}/pkg"
-		FileUtils.copy "pkg/#{tar}", "#{path}/pkg/#{tar}"
-	    end
-	  end
-	end
-    end
-
   end
 
 end

data/lib/opskeleton/thorable.rb

@@ -17,8 +17,7 @@ module Opsk
 
     def type_of
 	return :puppet if meta.includes.include?('Puppetfile')
-	return :chef if meta.includes.include?('Cheffile')
-	raise Exception.new('no matching provisoner type found, make sure to include Cheffile or Pupppetfile in opsk.yaml')
+	raise Exception.new('no matching provisoner type found, make sure to include Pupppetfile in opsk.yaml')
     end
 
     def name 

data/lib/opskeleton/update.rb

@@ -0,0 +1,27 @@
+module  Opsk
+  class Update < Thor::Group
+    include Thorable, Thor::Actions
+    class_option :module, :type=> :string, :desc => 'module to update'
+
+    def update
+	Dir["./*"].reject{|o| not File.directory?(o)}.each do |d|
+	  resp = yes?("Update #{d}? (y/n)") unless options['all']
+	  if File.exists?("#{d}/Puppetfile") and resp
+	    inside(d) do
+		run("librarian-puppet update #{options['module']}")
+	    end
+	    resp = yes?("Commit Puppetfile.lock#{d}? (y/n)") unless options['all']
+	    if resp
+		git = Opsk::Git.new(d,self)
+		git.add("#{d}/Puppetfile.lock")
+		git.commit("Opsk: updating #{options['module']}")
+		git.push
+	    end
+	  end
+	end
+    end
+
+  end
+
+end
+

data/lib/opskeleton/version.rb

@@ -1,3 +1,3 @@
 module Opskeleton
-  VERSION = '0.9.8'
+  VERSION = '0.9.9'
 end

data/opskeleton.gemspec

@@ -8,27 +8,25 @@ Gem::Specification.new do |gem|
   gem.version       = Opskeleton::VERSION
   gem.authors       = ["narkisr"]
   gem.email         = ["narkisr@gmail.com"]
-  gem.description   = %q{A generator for ops projects that include vagrant puppet and fpm}
-  gem.summary       = %q{A generator for ops projects that include vagrant puppet and fpm}
+  gem.description   = %q{Managing services lifecycle from Development to production using Vagrant and Puppet}
+  gem.summary       = %q{Managing services lifecycle from Development to production using Vagrant and Puppet}
   gem.homepage      = "https://github.com/narkisr/opskeleton"
   gem.add_dependency('thor')
   gem.add_dependency('bintray_deploy')
   gem.add_dependency('aws-sdk', '~> 2')
   gem.add_dependency('net-scp')
   gem.add_dependency('git')
-  gem.add_dependency('git_clone_url')
-  gem.add_development_dependency('puppet','=3.7.5')
-  gem.add_development_dependency('chef')
+  gem.add_dependency('git_clone_url', '~> 1.0')
+  gem.add_development_dependency('puppet','=3.8.7')
   gem.add_development_dependency('rspec-puppet')
   gem.add_development_dependency('librarian-puppet', '= 2.1.0')
   gem.add_development_dependency('puppetlabs_spec_helper', '>= 0.1.0')
-  gem.add_development_dependency('pry')
   gem.add_development_dependency('asciidoctor')
   gem.add_development_dependency('pygments.rb')
-  gem.add_development_dependency('guard')
+  gem.add_development_dependency('guard', '= 2.13.0')
   gem.add_development_dependency('guard-shell')
   gem.add_development_dependency('guard-minitest')
-
+  
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})

data/test/test_helper.rb

@@ -7,7 +7,6 @@ require 'opskeleton'
 module Opsk
   class Root < Thor
     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'
     register Opsk::Commit, 'commit', 'commit', 'commits current module for celestial'
     register Opsk::Push, 'push', 'push', 'push changed repos'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opskeleton
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 0.9.9
 platform: ruby
 authors:
 - narkisr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-26 00:00:00.000000000 Z
+date: 2017-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -84,44 +84,30 @@ dependencies:
   name: git_clone_url
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: puppet
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.7.5
+        version: 3.8.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.7.5
-- !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'
+        version: 3.8.7
 - !ruby/object:Gem::Dependency
   name: rspec-puppet
   requirement: !ruby/object:Gem::Requirement
@@ -164,20 +150,6 @@ dependencies:
     - - ">="
       - !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'
 - !ruby/object:Gem::Dependency
   name: asciidoctor
   requirement: !ruby/object:Gem::Requirement
@@ -210,16 +182,16 @@ dependencies:
   name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.13.0
 - !ruby/object:Gem::Dependency
   name: guard-shell
   requirement: !ruby/object:Gem::Requirement
@@ -248,7 +220,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: A generator for ops projects that include vagrant puppet and fpm
+description: Managing services lifecycle from Development to production using Vagrant
+  and Puppet
 email:
 - narkisr@gmail.com
 executables:
@@ -268,6 +241,7 @@ files:
 - README.md
 - Rakefile
 - TODOS
+- autocomplete/_opsk
 - autocomplete/opsk_bash_completion
 - bin/opsk
 - docs/chef.md
@@ -280,14 +254,13 @@ files:
 - img/puppet-cycle.png
 - img/puppet-layout.png
 - lib/opskeleton.rb
+- lib/opskeleton/analyze.rb
 - lib/opskeleton/bump.rb
 - lib/opskeleton/clean.rb
 - lib/opskeleton/commit.rb
 - lib/opskeleton/deploy_bintray.rb
 - lib/opskeleton/deploy_s3.rb
 - lib/opskeleton/deploy_scp.rb
-- lib/opskeleton/dockerize.rb
-- lib/opskeleton/generate_chef.rb
 - lib/opskeleton/generate_puppet.rb
 - lib/opskeleton/git.rb
 - lib/opskeleton/module.rb
@@ -295,25 +268,12 @@ files:
 - lib/opskeleton/push.rb
 - lib/opskeleton/thorable.rb
 - lib/opskeleton/uncommited.rb
+- lib/opskeleton/update.rb
 - lib/opskeleton/version.rb
 - opskeleton.gemspec
 - templates/LICENSE-2.0.txt
 - templates/README.erb
-- templates/chef/Cheffile
-- templates/chef/Gemfile.erb
-- templates/chef/Rakefile.erb
-- templates/chef/boot.sh
-- templates/chef/dna.json.erb
-- templates/chef/environments/dev.rb
-- templates/chef/gitignore
-- templates/chef/opsk.yaml
-- templates/chef/roles.erb
-- templates/chef/run.sh
-- templates/chef/solo.rb
-- templates/chef/ubuntu_docker.erb
-- templates/chef/vagrant.erb
 - templates/clean.yaml
-- templates/fig.yml.erb
 - templates/gitignore
 - templates/hiera.yaml
 - templates/hiera_vagrant.yaml
@@ -338,7 +298,6 @@ files:
 - templates/ruby-gemset.erb
 - templates/ruby-version.erb
 - templates/spec.erb
-- test/chef_package_test.rb
 - test/git_test.rb
 - test/puppet_package_test.rb
 - test/test_helper.rb
@@ -361,12 +320,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
-summary: A generator for ops projects that include vagrant puppet and fpm
+summary: Managing services lifecycle from Development to production using Vagrant
+  and Puppet
 test_files:
-- test/chef_package_test.rb
 - test/git_test.rb
 - test/puppet_package_test.rb
 - test/test_helper.rb

data/lib/opskeleton/dockerize.rb

@@ -1,29 +0,0 @@
-module Opsk 
-  class Dockerize < Thor::Group
-    include Thorable, Thor::Actions
-
-    argument :from, :type => :string, :desc => 'Which source image to use'
-    argument :os_type, :type=> :string, :desc => 'Flavor of container Ubuntu/Centos'
-
-
-    desc 'Creates a docker image using the current opsk sandbox'
-
-    def validate
-	check_root
-    end
-
-
-    def create_dockerfiles
-	empty_directory('dockerfiles')
-	machines.each {|m|
-	  empty_directory("dockerfiles/#{m}/")
-	  template("templates/#{type_of}/docker/#{os_type}_docker.erb", "dockerfiles/#{m}/Dockerfile")
-	}
-    end
-
-    def fig
-	template("templates/fig.yml.erb", 'fig.yml')
-    end
-
-  end
-end

data/lib/opskeleton/generate_chef.rb

@@ -1,85 +0,0 @@
-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)'
-    class_option :bench_enable, :type=> :boolean, :desc => 'Control if to enable benchmarking support'
-
-    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
-	template('templates/chef/Gemfile.erb', "#{path}/Gemfile")
-    end
-
-    def create_rakefile
-	template('templates/chef/Rakefile.erb', "#{path}/Rakefile")
-    end
-
-    def create_version
-	template('templates/chef/opsk.yaml', "#{path}/opsk.yaml")
-    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_environment
-	empty_directory("#{path}/environments")
-	copy_file('templates/chef/environments/dev.rb', "#{path}/environments/dev.rb")
-    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/chef/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
-	empty_directory("#{path}/spec")
-	template('templates/parent/spec/spec_helper.erb', "#{path}/spec/spec_helper.rb")
-	directory('templates/parent/spec/default', "#{path}/spec/default")
-    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