chef-flavor-flay 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c72d0e44295ab3589e7b7e704fe9252816c48712
-  data.tar.gz: 0eb2e5c9d4d70a949db79a0487ab508d6a38b5a4
+  metadata.gz: 6004130893e0dbbf3076601daa87a18c33c65ae5
+  data.tar.gz: e122ca4b0c615d20458b6364be4dd7b7a55b5449
 SHA512:
-  metadata.gz: 4206313a0332a8e67e42189e85056d651b901d73c48bc595ec2a9d2bb5426984457db45e419c3c85dd334ee1db455994d63db7cf09c5d240248aa527e315fc00
-  data.tar.gz: 087447bfa725cd290ca7c268777b1267462f235c6fce931df4fd8dc535e6818bff1449b102ffeb3f380d8c0e768ee59902be8f5a03d5b01120b4b33e472657b3
+  metadata.gz: ad59eacc961fbc1ab9d12463b6ba93ac4b7372b0e053df38216956fbd6f02c3de24fa3537048e346c93826ae7f2619cb4287e23ccd4b05873a823c03aefc9128
+  data.tar.gz: e5eeeca767a8c5f83ffd940e44cfc5e3238d8ee17f449ecfb96d5407e10ee3406e993c32cce8df2ffc435fd177624c639115827091af648798410dd6320cb702

data/lib/flay/commands/release.rb

@@ -38,7 +38,7 @@ class Flay::Commands::Release < Thor::Group
 
   def berks_upload
     say "Uploading cookbook to chef server...", :green
-    shell_exec("chef exec berks upload")
+    shell_exec("chef exec berks upload --except=test integration")
   end
 
   def all_done

data/lib/flay/version.rb

@@ -1,3 +1,3 @@
 module Flay
-  VERSION = "1.0.1".freeze
+  VERSION = "1.1.0".freeze
 end

data/shared/flavor/flay/libraries/context.rb

@@ -0,0 +1,23 @@
+module Flay # rubocop:disable Style/ClassAndModuleChildren
+  class Context < SimpleDelegator
+    alias_method :context, :__getobj__
+
+    def self.current
+      @current ||= Context.new(ChefDK::Generator.context)
+    end
+
+    module Helper
+      extend Forwardable
+
+      delegate %i(cookbook_name directory_name) => :flay_cookbook
+
+      private
+
+      def flay_cookbook
+        @flay_cookbook ||= Flay::Cookbook.new(ChefDK::Generator.context.cookbook_name)
+      end
+    end
+
+    include Helper
+  end
+end

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

@@ -0,0 +1,24 @@
+module Flay # rubocop:disable Style/ClassAndModuleChildren
+  class Cookbook
+    PREFIX    = "chef-".freeze
+    NAMESPACE = "swpr_".freeze
+    PATTERN   = /\A(#{PREFIX})?(#{NAMESPACE})?(.*)\z/.freeze
+
+    attr_reader :prefix, :namespace, :name
+
+    def initialize(name)
+      match      = PATTERN.match(name)
+      @prefix    = match[1] || PREFIX
+      @namespace = match[2] || NAMESPACE
+      @name      = match[3]
+    end
+
+    def cookbook_name
+      @cookbook_name ||= "#{namespace}#{name}"
+    end
+
+    def directory_name
+      @directory_name ||= "#{prefix}#{namespace}#{name}"
+    end
+  end
+end

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

@@ -1,5 +1,5 @@
-context      = ChefDK::Generator.context
-cookbook_dir = File.join(context.cookbook_root, context.cookbook_name)
+context      = Flay::Context.current
+cookbook_dir = File.join(context.cookbook_root, context.directory_name)
 kitchen_dir  = File.join(cookbook_dir, "test", "integration")
 
 # Common Cookbook Things

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

@@ -1,5 +1,5 @@
-context          = ChefDK::Generator.context
-cookbook_dir     = File.join(context.cookbook_root, context.cookbook_name)
+context          = Flay::Context.current
+cookbook_dir     = File.join(context.cookbook_root, context.directory_name)
 recipe_path      = File.join(cookbook_dir, "recipes", "#{context.new_file_basename}.rb")
 spec_helper_path = File.join(cookbook_dir, "test", "unit", "spec_helper.rb")
 spec_path        = File.join(cookbook_dir, "test", "unit", "recipes", "#{context.new_file_basename}_spec.rb")

data/shared/flavor/flay/resources/template.rb

@@ -2,25 +2,20 @@ default_action :create_if_missing
 
 property :name, String, name_property: true
 property :source, String
-property :use_helpers, [TrueClass, FalseClass], default: true
 
 action :create do
   template new_resource.name do
     source new_resource.source
-    helper(:sanitized_cookbook_name) { cookbook_name.sub(/\Achef-/, "") }
-    helpers new_resource.helpers
+    helpers ChefDK::Generator::TemplateHelper
+    helpers Flay::Context::Helper
   end
 end
 
 action :create_if_missing do
   template new_resource.name do
     source new_resource.source
-    helper(:sanitized_cookbook_name) { cookbook_name.sub(/\Achef-/, "") }
-    helpers new_resource.helpers
+    helpers ChefDK::Generator::TemplateHelper
+    helpers Flay::Context::Helper
     action :create_if_missing
   end
 end
-
-def helpers
-  use_helpers ? ChefDK::Generator::TemplateHelper : []
-end

data/shared/flavor/flay/templates/default/LICENSE.erb

@@ -1 +1 @@
-<%= license_description("#").rstrip %>
+<%= license_description.rstrip %>

data/shared/flavor/flay/templates/default/README.md.erb

@@ -1,8 +1,8 @@
-# <%= sanitized_cookbook_name %>
+# <%= cookbook_name %>
 
-[![Build Status](https://travis-ci.org/sweeperio/<%= cookbook_name %>.svg?branch=master)](https://travis-ci.org/sweeperio/<%= cookbook_name %>)
+[![Build Status](https://travis-ci.org/sweeperio/<%= directory_name %>.svg?branch=master)](https://travis-ci.org/sweeperio/<%= directory_name %>)
 
-Install/configure <%= sanitized_cookbook_name %>
+Install/configure <%= cookbook_name %>
 
 ## What This Does
 
@@ -16,15 +16,15 @@ Install/configure <%= sanitized_cookbook_name %>
 
 | attribute | description | default |
 |-----------|-------------|---------|
-| `node["<%= sanitized_cookbook_name %>"]["value"]` | some description | `""` |
+| `node["<%= cookbook_name %>"]["value"]` | some description | `""` |
 
 ## Recipes
 
-### <%= sanitized_cookbook_name %>::default
+### <%= cookbook_name %>::default
 
 TODO: description
 
-**Usage:** add `recipe[<%= sanitized_cookbook_name %>]` to your run list.
+**Usage:** add `recipe[<%= cookbook_name %>]` to your run list.
 
 ## License
 

data/shared/flavor/flay/templates/default/kitchen.yml.erb

@@ -13,5 +13,5 @@ platforms:
 suites:
   - name: default
     run_list:
-      - recipe[<%= sanitized_cookbook_name %>]
+      - recipe[<%= cookbook_name %>]
     attributes:

data/shared/flavor/flay/templates/default/metadata.rb.erb

@@ -1,17 +1,17 @@
 # rubocop:disable Style/SingleSpaceBeforeFirstArg
-name             "<%= sanitized_cookbook_name %>"
+name             "<%= cookbook_name %>"
 maintainer       "<%= copyright_holder %>"
 maintainer_email "<%= email %>"
 license          "<%= license %>"
-description      "Installs/Configures <%= sanitized_cookbook_name %>"
+description      "Installs/Configures <%= cookbook_name %>"
 long_description IO.read(File.join(File.dirname(__FILE__), "README.md"))
 version          "0.1.0"
 # rubocop:enable Style/SingleSpaceBeforeFirstArg
 
 supports "ubuntu"
 
-depends "core", "~> 0.0"
+depends "swpr_core", "~> 0.0"
 
 chef_version ">= 12.5" if respond_to?(:chef_version)
-source_url "YOUR SOURCE REPO URL" if respond_to?(:source_url)
-issues_url "WHERE TO LOG ISSUES" if respond_to?(:issues_url)
+source_url "https://github.com/sweeperio/<%= directory_name %>" if respond_to?(:source_url)
+issues_url "https://github.com/sweeperio/<%= directory_name %>/issues" if respond_to?(:issues_url)

data/shared/flavor/flay/templates/default/recipe.rb.erb

@@ -1,5 +1,5 @@
 #
-# Cookbook Name:: <%= sanitized_cookbook_name %>
+# Cookbook Name:: <%= cookbook_name %>
 # Recipe:: <%= recipe_name %>
 #
 <%= license_description("#").rstrip %>

data/shared/flavor/flay/templates/default/recipe_spec.rb.erb

@@ -1,10 +1,10 @@
 #
-# Cookbook Name:: <%= sanitized_cookbook_name %>
+# Cookbook Name:: <%= cookbook_name %>
 # Spec:: <%= recipe_name %>
 #
 <%= license_description("#").rstrip %>
 
-describe "<%= sanitized_cookbook_name %>::<%= recipe_name %>" do
+describe "<%= cookbook_name %>::<%= recipe_name %>" do
   cached(:chef_run) do
     runner = ChefSpec::SoloRunner.new
     runner.converge(described_recipe)

data/shared/flavor/flay/templates/default/serverspec_default_spec.rb.erb

@@ -1,4 +1,4 @@
 require "spec_helper"
 
-describe "<%= sanitized_cookbook_name %>" do
+describe "<%= cookbook_name %>" do
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-flavor-flay
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - pseudomuto
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-09 00:00:00.000000000 Z
+date: 2016-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-gen-flavors
@@ -87,6 +87,8 @@ files:
 - shared/flavor/flay/files/default/test/integration/helpers/serverspec/spec_helper.rb
 - shared/flavor/flay/files/default/test/unit/spec_helper.rb
 - shared/flavor/flay/files/default/travis.yml
+- shared/flavor/flay/libraries/context.rb
+- shared/flavor/flay/libraries/cookbook.rb
 - shared/flavor/flay/metadata.rb
 - shared/flavor/flay/recipes/cookbook.rb
 - shared/flavor/flay/recipes/recipe.rb