chef-flavor-flay 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f079d980eef92521cd03d0c927afa918d856f6f
-  data.tar.gz: 8f012e3247d68a05ee0e697ef020f6c18a57ea4c
+  metadata.gz: 32dae8d8ec27b60daf4ddf74271a57cd83c3b80f
+  data.tar.gz: 3fb9dce91f352246f5de60c8c59c0c20b0707880
 SHA512:
-  metadata.gz: 06f2f667988e80583a76c0442eb65538fa87521a46e75c768617bd35e812f06d08aeaa20014e791c57be5ece079cd90d9bd519ac8f303eee97f817b46d4c1e25
-  data.tar.gz: 79f9aa69916bab25d696ca20df4b6362e9681851220e878fee571f0e7b085d25e00e4b4145d9b4cede1f06bc46a367c78354982a9d1b08dd94d9aa0c13fc44ac
+  metadata.gz: 6ef158d393e4a40f03602e14799d78ffe36c23d5c673c1f6bf6bea0a5d5bebcdec1f78608b23c95004d72e29a082094160c6323529d503ece050a9cccbff075a
+  data.tar.gz: 9a1a0674f340208b7a2b43f0f4fd6c1ed0200d2a1ecf783447ea094066721631792f6d2b2d554c7f3a19cd434eb04ad4accacb32f3c4672828299fea54b38819

data/.rspec

@@ -0,0 +1,4 @@
+--order rand
+--color
+--format progress
+--require spec_helper

data/.rubocop.yml

@@ -10,6 +10,12 @@ Style/StringLiterals:
 Style/Documentation:
   Enabled: false
 
+Style/ClassAndModuleChildren:
+  EnforcedStyle: compact
+
+Style/SingleLineBlockParams:
+  Enabled: false
+
 Metrics/LineLength:
   Max: 120
 

data/Gemfile

@@ -1,10 +1,13 @@
 source "https://rubygems.org"
 gemspec
 
-group :development do
+group :development, :test do
   gem "aruba", "~> 0.0"
   gem "bundler", "~> 1.11"
   gem "chef-dk", "~> 0.0"
+  gem "coveralls", require: false
+  gem "pry-byebug", "~> 3.0"
   gem "rake", "~> 10.0"
+  gem "rspec", "~> 3.0"
   gem "rubocop", "~> 0.0"
 end

data/README.md

@@ -1,6 +1,8 @@
 # Flay - A Customizable Chef Cookbook Template
 
 [![Build Status](https://travis-ci.org/sweeperio/flay.svg?branch=master)](https://travis-ci.org/sweeperio/flay)
+[![Gem Version](https://badge.fury.io/rb/chef-flavor-flay.svg)](https://badge.fury.io/rb/chef-flavor-flay)
+[![Coverage Status](https://coveralls.io/repos/sweeperio/flay/badge.svg?branch=master&service=github)](https://coveralls.io/github/sweeperio/flay?branch=master)
 
 This repo is a custom cookbook/recipe template for use with the [ChefDK]. It uses [chef-gen-flavors] to create a custom
 template that can be used with `chef generate [cookbook|recipe]` commands. 
@@ -69,19 +71,33 @@ Celebrate! :rocket:
 
 ## Usage
 
-* `chef generate cookbook my_cookbook`
-* `chef generate recipe my_recipe` (from within the cookbook directory)
+* `chef exec flay cookbook my_cookbook`
+* `chef exec flay recipe my_cookbook` (from within the cookbook directory)
+* `chef exec flay release` (see below)
 
-If you're using this for sweeper cookbooks you should use these instead. They simply call the normal generate methods
-but pass parameters for maintainer, email and license.
+There are a few other commands available. Run `chef exec flay help` for details.
 
-* `chef exec flay cookbook my_cookbook`
-* `chef exec flay recipe my_cookbook`
+### Releasing Cookbooks
+
+Modelled after bundler's `rake release`, there's `chef exec flay release`.
+
+When the following conditions are met:
+
+* `Dir.pwd` is a git repo (or a subdirectory of one)
+* There are no uncommitted changes in git
+* _metadata.rb_ exists (at the root of the repo) and contains a valid version
+
+It will run:
+
+* `git tag -a -m "Version #{version}" v#{version}` - unless the tag already exists
+* `git push && git push --tags`
+* `chef exec berks install`
+* `chef exec berks upload --no-ssl-verify`
 
 ### Example
 
 ```
-$ chef generate cookbook chef-demo-flay
+$ chef exec flay generate cookbook chef-demo-flay
 
 using ChefGen flavor 'flay'
 Compiling Cookbooks...

data/Rakefile

@@ -1,9 +1,11 @@
 require "bundler/gem_tasks"
 
 require "cucumber/rake/task"
+require "rspec/core/rake_task"
 require "rubocop/rake_task"
 
 Cucumber::Rake::Task.new(:features)
+RSpec::Core::RakeTask.new(:spec)
 RuboCop::RakeTask.new(:rubocop)
 
-task default: [:rubocop, :features]
+task default: [:rubocop, :spec, :features]

data/cucumber.yml

@@ -0,0 +1,2 @@
+default:  -r features --format "pretty" --tags ~@wip --snippet-type regexp
+wip:      -r features --tags @wip --wip

data/exe/flay

@@ -1,30 +1,6 @@
 #!/usr/bin/env ruby
 
-require "open3"
+ENV["CHEFGEN_FLAVOR"] = "flay"
 
-ARGS = "-C sweeper.io -m developers@sweeper.io -I mit".freeze
-
-def run_generator(type, name)
-  command = "chef generate #{type} #{name} #{ARGS}"
-  output, err, status = Open3.capture3(command)
-  puts output
-  puts err if status != 0
-end
-
-def usage
-  puts "USAGE:"
-  puts "flay cookbook NAME"
-  puts "flay recipe NAME"
-  exit 1
-end
-
-type, name = ARGV
-usage if ARGV.size != 2
-usage if type.nil? || name.nil?
-
-case type
-when "cookbook" then run_generator("cookbook", name)
-when "recipe" then run_generator("recipe", name)
-else
-  usage
-end
+require "flay"
+Flay::CLI.start

data/flay.gemspec

@@ -1,7 +1,10 @@
 # coding: utf-8
+$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
+require "flay/version"
+
 Gem::Specification.new do |spec|
   spec.name          = "chef-flavor-flay"
-  spec.version       = "0.2.1"
+  spec.version       = Flay::VERSION
   spec.authors       = ["pseudomuto"]
   spec.email         = ["developers@sweeper.io"]
 
@@ -16,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "chef-gen-flavors", "~> 0.9"
+  spec.add_runtime_dependency "thor", "~> 0.0"
 
   spec.post_install_message = <<-EOM
   Thanks for installing chef-flavor-flay! Be sure to update your knife.rb file

data/lib/chef_gen/flavor/flay.rb

@@ -1,9 +1,8 @@
-module ChefGen
-  module Flavor
+module ChefGen # rubocop:disable Style/ClassAndModuleChildren
+  module Flavor # rubocop:disable Style/ClassAndModuleChildren
     class Flay
-      NAME    = "flay".freeze
-      DESC    = "Generate a new cookbook with **better** defaults".freeze
-      VERSION = "0.2.1".freeze
+      NAME = "flay".freeze
+      DESC = "Generate a new cookbook with **better** defaults".freeze
 
       attr_reader :temp_path
 

data/lib/flay.rb

@@ -0,0 +1,9 @@
+require "open3"
+require "thor"
+
+module Flay
+  autoload :CLI, "flay/cli"
+  autoload :Commands, "flay/commands"
+  autoload :Helpers, "flay/helpers"
+  autoload :VERSION, "flay/version"
+end

data/lib/flay/cli.rb

@@ -0,0 +1,26 @@
+class Flay::CLI < Thor
+  include Thor::Actions
+
+  package_name "flay"
+
+  Flay::Commands::Generate.register_with(self, as: "generate")
+  Flay::Commands::Release.register_with(self, as: "release")
+
+  method_option(
+    :chef_path,
+    type: :string,
+    desc: "The path that contains your knife.rb file",
+    default: "~/.chef-sweeper"
+  )
+  desc "link [--chef-path=PATH]", "symlinks .chef to --chef-path"
+  long_desc "Creates a symlink in the current directory from .chef to --chef-path"
+  def link
+    create_link File.join(Dir.pwd, ".chef"), options.fetch("chef_path")
+  end
+
+  desc "version", "display the current version"
+  long_desc "Show the current version of flay"
+  def version
+    say "flay version: #{Flay::VERSION}"
+  end
+end

data/lib/flay/commands.rb

@@ -0,0 +1,4 @@
+module Flay::Commands
+  autoload :Generate, "flay/commands/generate"
+  autoload :Release, "flay/commands/release"
+end

data/lib/flay/commands/generate.rb

@@ -0,0 +1,21 @@
+class Flay::Commands::Generate < Thor
+  include Flay::Helpers
+
+  ARGS = "-C sweeper.io -m developers@sweeper.io -I mit".freeze
+
+  def self.register_with(thor, as: "MISSING NAME")
+    thor.register(self, as, "#{as} TYPE NAME", "generate a cookbook/recipe using flay defaults")
+  end
+
+  desc "cookbook NAME", "generate a cookbook"
+  long_desc "generates a cookbook with steeze"
+  def cookbook(name)
+    shell_exec("chef generate cookbook #{name} #{ARGS}")
+  end
+
+  desc "recipe NAME", "generate a recipe"
+  long_desc "generates a recipe with steeze"
+  def recipe(name)
+    shell_exec("chef generate recipe #{name} #{ARGS}")
+  end
+end

data/lib/flay/commands/release.rb

@@ -0,0 +1,87 @@
+class Flay::Commands::Release < Thor::Group
+  include Flay::Helpers
+  include Thor::Actions
+
+  ERROR_METADATA = "metadata.rb file not found in current repo".freeze
+  ERROR_GIT      = "There are files that need to be committed before releasing".freeze
+  ERROR_VERSION  = "Missing or invalid version in metadata.rb".freeze
+
+  VERSION_MATCH = /^\s*version\s*\(?'?"?([^"']+)"?'?\)?\s*$/.freeze
+
+  def self.register_with(thor, as: "MISSING NAME")
+    thor.register(self, as, as, "creates a release for this cookbook")
+  end
+
+  desc "creates a new release and uploads it"
+
+  def fail_fast
+    exit 1 unless git_repo? && git_clean? && git_committed?
+    exit 1 if version.nil?
+  end
+
+  def berks_install
+    say "Installing berks dependencies...", :green
+    shell_exec("chef exec berks install")
+  end
+
+  def create_tag
+    say "Tag for v#{version} already exists!", :green && return if tag_exists?
+    say "Creating tag for v#{version}...", :green
+    shell_exec("git tag -a -m \"Version #{version}\" v#{version}")
+  end
+
+  def push_commits_and_tags
+    say "Pushing commits and tags...", :green
+    exit 1 unless shell_exec_quiet("git push", error_message: "Couldn't push commits")
+    exit 1 unless shell_exec_quiet("git push --tags", error_message: "Couldn't push tags")
+  end
+
+  def berks_upload
+    say "Uploading cookbook to chef server...", :green
+    shell_exec("chef exec berks upload --no-ssl-verify")
+  end
+
+  def all_done
+    say "Done! Version v#{version} pushed to git remote and chef server.", :green
+  end
+
+  private
+
+  def version
+    return nil unless metadata_exists?
+
+    @version ||= begin
+      contents = File.read(metadata_path)
+      version  = VERSION_MATCH.match(contents)
+      return version[1] if version && Gem::Version.correct?(version[1])
+
+      say ERROR_VERSION, :red
+      nil
+    end
+  end
+
+  def metadata_exists?
+    path = metadata_path
+    say ERROR_METADATA, :red unless path && File.exist?(path)
+    path && File.exist?(path)
+  end
+
+  def git_repo?
+    return true unless git_root.nil?
+    say ERROR_GIT, :red
+    false
+  end
+
+  def git_clean?
+    shell_exec_quiet("git diff --exit-code", error_message: ERROR_GIT)
+  end
+
+  def git_committed?
+    shell_exec_quiet("git diff-index --quiet --cached HEAD", error_message: ERROR_GIT)
+  end
+
+  def tag_exists?
+    tags = shell_exec("git tag").first
+    tags.include?("v#{version}")
+  end
+end

data/lib/flay/helpers.rb

@@ -0,0 +1,31 @@
+module Flay::Helpers
+  def metadata_path
+    return nil if git_root.nil?
+    File.join(git_root, "metadata.rb")
+  end
+
+  def git_root
+    @git_root ||= begin
+      output, _, status = shell_exec("git rev-parse --show-toplevel", show_output: false)
+      return nil unless status == 0
+      output.chomp
+    end
+  end
+
+  def shell_exec(command, show_output: true)
+    output, error, status = Open3.capture3(command)
+
+    if show_output
+      say output
+      say error, :red unless status == 0
+    end
+
+    [output, error, status]
+  end
+
+  def shell_exec_quiet(command, error_message: nil)
+    status = shell_exec(command, show_output: false).last
+    say error_message, :red if error_message && status != 0
+    status == 0
+  end
+end

data/lib/flay/version.rb

@@ -0,0 +1,3 @@
+module Flay
+  VERSION = "0.3.0".freeze
+end

data/shared/flavor/flay/recipes/cookbook.rb

@@ -9,7 +9,6 @@ directory "#{cookbook_dir}/recipes"
 cookbook_file("#{cookbook_dir}/.gitignore") { source "gitignore" }
 cookbook_file("#{cookbook_dir}/.rubocop.yml") { source "rubocop.yml" }
 cookbook_file("#{cookbook_dir}/Berksfile") { action :create_if_missing }
-cookbook_file("#{cookbook_dir}/.bundle/config") { source "bundle_config" }
 cookbook_file "#{cookbook_dir}/chefignore"
 cookbook_file "#{cookbook_dir}/Gemfile"
 cookbook_file "#{cookbook_dir}/Rakefile"
@@ -20,6 +19,11 @@ flay_template "#{cookbook_dir}/README.md"
 # ChefSpec
 directory("#{cookbook_dir}/test/unit/recipes") { recursive true }
 
+cookbook_file "#{cookbook_dir}/test/unit/spec_helper.rb" do
+  source "spec_helper.rb"
+  action :create_if_missing
+end
+
 cookbook_file("#{cookbook_dir}/.rspec") { source "rspec" }
 cookbook_file("#{cookbook_dir}/.travis.yml") { source "travis.yml" }
 
@@ -40,11 +44,6 @@ cookbook_file "#{cookbook_dir}/test/integration/helpers/serverspec/spec_helper.r
   action :create_if_missing
 end
 
-cookbook_file "#{cookbook_dir}/test/unit/spec_helper.rb" do
-  source "spec_helper.rb"
-  action :create_if_missing
-end
-
 flay_template("#{cookbook_dir}/.kitchen.yml") { source "kitchen.yml.erb" }
 
 flay_template "#{cookbook_dir}/test/integration/default/serverspec/default_spec.rb" do

data/shared/flavor/flay/recipes/recipe.rb

@@ -6,7 +6,10 @@ spec_path        = File.join(cookbook_dir, "test", "unit", "recipes", "#{context
 
 directory("#{cookbook_dir}/test/unit/recipes") { recursive true }
 
-cookbook_file(spec_helper_path) { action :create_if_missing }
+cookbook_file spec_helper_path do
+  source "spec_helper.rb"
+  action :create_if_missing
+end
 
 flay_template(recipe_path) { source "recipe.rb.erb" }
 flay_template(spec_path) { source "recipe_spec.rb.erb" }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-flavor-flay
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - pseudomuto
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-29 00:00:00.000000000 Z
+date: 2015-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-gen-flavors
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
 description: A Chef cookbook generator using [chef-gen-flavors](https://rubygems.org/gems/chef-gen-flavors)
 email:
 - developers@sweeper.io
@@ -33,6 +47,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - ".rubocop.yml"
 - ".ruby-version"
 - ".travis.yml"
@@ -43,13 +58,20 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- cucumber.yml
 - exe/flay
 - flay.gemspec
 - lib/chef_gen/flavor/flay.rb
+- lib/flay.rb
+- lib/flay/cli.rb
+- lib/flay/commands.rb
+- lib/flay/commands/generate.rb
+- lib/flay/commands/release.rb
+- lib/flay/helpers.rb
+- lib/flay/version.rb
 - shared/flavor/flay/files/default/Berksfile
 - shared/flavor/flay/files/default/Gemfile
 - shared/flavor/flay/files/default/Rakefile
-- shared/flavor/flay/files/default/bundle_config
 - shared/flavor/flay/files/default/chefignore
 - shared/flavor/flay/files/default/encrypted_data_bag_secret
 - shared/flavor/flay/files/default/gitignore

data/shared/flavor/flay/files/default/bundle_config

@@ -1,3 +0,0 @@
----
-BUNDLE_DISABLE_SHARED_GEMS: "1"
-BUNDLE_WITHOUT: production