tvd-tvdinner 0.0.15 → 0.0.16

data/VERSION

@@ -1 +1 @@
-0.0.15
+0.0.16

data/cookbooks/tvdinner/files/default/cook

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+#/ NAME
+#/     cook -- call chef-solo with all the weird stuff tvdinners need
+#/
+#/ SYNOPSIS
+#/     cook
+
+# figure out the project root under which bin, lib live
+shome="$(unset CDPATH; cd -P -- "$(dirname -- "$BASH_SOURCE")/.." && pwd -P)"
+
+# load a jason bourne library
+source "$shome/libexec/_jason"
+
+# entry point
+function main {
+  export RELEASE_DIR="$shome"
+  export PROJECT_DIR="$shome"
+  bundle exec chef-solo -c $shome/etc/chef/solo.rb "$@"
+}
+
+require sub "$BASH_SOURCE" "$@"

data/cookbooks/tvdinner/files/default/development.rb

@@ -0,0 +1,7 @@
+def dev(nm_gem, workarea="git")
+  gem nm_gem, (
+    File.exists?(File.expand_path("../#{workarea}/#{nm_gem}", __FILE__)) ? 
+      (ENV["EDIT_#{nm_gem.gsub(/[-]/, "_")}"] = "true"; { :path => "#{workarea}/#{nm_gem}" }) : 
+      Dir["vendor/cache/#{nm_gem}-*.gem"].collect {|x| [x.gsub(/\d+/) {|num| sprintf("%011d", num) }, x] }.sort[0][1].split(/-/)[-1].gsub(/\.gem$/,"")
+  )
+end

data/cookbooks/tvdinner/recipes/default.rb

@@ -31,7 +31,7 @@ template "#{node[:release_dir]}/.gitignore" do
   variables({
     :ignore => 
       %w(/.bundle/ /vendor/bundle/ /*.gem
-         /crash.log /output)})
+         /crash.log /output /git)})
 end
 
 %w(NOTICE README.md Gemfile).each do |f|
@@ -47,6 +47,19 @@ template "#{node[:release_dir]}/VERSION" do
   not_if { File.exists? "#{node[:release_dir]}/VERSION" }
 end
 
+directory "#{node[:release_dir]}/git" do
+  mode 00755
+end
+
+directory "#{node[:release_dir]}/lib" do
+  mode 00755
+end
+
+cookbook_file "#{node[:release_dir]}/lib/development.rb" do
+  mode 00644
+  source "development.rb"
+end
+
 cookbook_file "#{node[:release_dir]}/LICENSE" do
   mode 00644
   source "LICENSE"
@@ -103,6 +116,11 @@ remote_directory "#{node[:release_dir]}/libexec" do
   files_mode 00755
 end
 
+cookbook_file "#{node[:release_dir]}/bin/cook" do
+  mode 00755
+  source "cook"
+end
+
 cookbook_file "#{node[:release_dir]}/Makefile" do
   mode 00644
   source "Makefile"

data/cookbooks/tvdinner/templates/default/Gemfile.erb

@@ -1,11 +1,9 @@
+require "development"
+
 source "https://rubygems.org"
 
 gemspec
 
-def dev(nm_gem, workarea)
-  gem nm_gem, (ENV["EDIT_#{nm_gem.gsub("-","_")}"] ? { :path => "#{workarea}/#{nm_gem}" } : {})
-end
-
 gem "tvd-tvdinner" unless File.exists?(File.expand_path("../tvd-tvdinner.gemspec", __FILE__))
 gem "chefspec"
 gem "minitest-chef-handler"

data/cookbooks/tvdinner/templates/default/gemspec.erb

@@ -5,7 +5,7 @@ require "tvd-<%= node[:tvd][:name] %>/version"
 
 Gem::Specification.new do |s|
   s.name        = "tvd-<%= node[:tvd][:name] %>"
-  s.version     = TVDinner::<%= node[:tvd][:class] %>::VERSION
+  s.version     = ENV['EDIT_tvd_vagrant'] ? "#{TVDinner::<%= node[:tvd][:class] %>::VERSION}.rc#{%x(git log --max-count=1 --pretty=format:%ct)}" : TVDinner::<%= node[:tvd][:class] %>::VERSION
   s.homepage    = "<%= node[:tvd][:homepage] %>"
   s.license     = "Apache 2.0"
 
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
 
   s.require_path = "lib"
 
-  s.add_dependency "chef"
+  s.add_dependency "tvd-tvdinner"
 
   s.author      = "<%= node[:tvd][:author] %>"
   s.email       = "<%= node[:tvd][:email] %>"

data/cookbooks/tvdinner/templates/default/version.rb.erb

@@ -1,5 +1,5 @@
 module TVDinner
   module <%= node[:tvd][:class] %>
-    VERSION = File.read(File.dirname(__FILE__) + '/../../VERSION')
+    VERSION = File.read(File.dirname(__FILE__) + '/../../VERSION').strip
   end
 end

data/lib/development.rb

@@ -0,0 +1,7 @@
+def dev(nm_gem, workarea="git")
+  gem nm_gem, (
+    File.exists?(File.expand_path("../#{workarea}/#{nm_gem}", __FILE__)) ? 
+      (ENV["EDIT_#{nm_gem.gsub(/[-]/, "_")}"] = "true"; { :path => "#{workarea}/#{nm_gem}" }) : 
+      Dir["vendor/cache/#{nm_gem}-*.gem"].collect {|x| [x.gsub(/\d+/) {|num| sprintf("%011d", num) }, x] }.sort[0][1].split(/-/)[-1].gsub(/\.gem$/,"")
+  )
+end

data/lib/tvd-tvdinner/version.rb

@@ -1,5 +1,5 @@
 module TVDinner
   module TVDinner
-    VERSION = File.read(File.dirname(__FILE__) + '/../../VERSION')
+    VERSION = File.read(File.dirname(__FILE__) + '/../../VERSION').strip
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tvd-tvdinner
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 63
   prerelease: false
   segments: 
   - 0
   - 0
-  - 15
-  version: 0.0.15
+  - 16
+  version: 0.0.16
 platform: ruby
 authors: 
 - Tom Bombadil
@@ -19,7 +19,7 @@ date: 2013-03-06 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: chef
+  name: tvd-tvdinner
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -32,7 +32,7 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id001
-description: Generates scaffolding for a tvdinner gem
+description: Generrates a tvdinner project
 email: amanibhavam@destructuring.org
 executables: []
 
@@ -44,6 +44,8 @@ files:
 - cookbooks/tvdinner/attributes/default.rb
 - cookbooks/tvdinner/files/default/LICENSE
 - cookbooks/tvdinner/files/default/Makefile
+- cookbooks/tvdinner/files/default/cook
+- cookbooks/tvdinner/files/default/development.rb
 - cookbooks/tvdinner/files/default/jason/_bump
 - cookbooks/tvdinner/files/default/jason/_jason
 - cookbooks/tvdinner/files/default/jason/_log4sh
@@ -52,7 +54,6 @@ files:
 - cookbooks/tvdinner/files/default/jasonx/build-gem
 - cookbooks/tvdinner/files/default/jasonx/build-site
 - cookbooks/tvdinner/files/default/jasonx/bump
-- cookbooks/tvdinner/files/default/jasonx/edit-gem
 - cookbooks/tvdinner/files/default/jasonx/publish-gem
 - cookbooks/tvdinner/files/default/jasonx/publish-site
 - cookbooks/tvdinner/recipes/default.rb
@@ -67,6 +68,7 @@ files:
 - cookbooks/tvdinner/templates/default/solo.rb.erb
 - cookbooks/tvdinner/templates/default/tvdinner.rb.erb
 - cookbooks/tvdinner/templates/default/version.rb.erb
+- lib/development.rb
 - lib/tvd-tvdinner.rb
 - lib/tvd-tvdinner/version.rb
 - spec/.gitignore
@@ -108,7 +110,7 @@ rubyforge_project:
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Generates scaffolding for a tvdinner gem
+summary: Generates a tvdinner project
 test_files: 
 - spec/.gitignore
 - tasks/.gitignore

data/cookbooks/tvdinner/files/default/jasonx/edit-gem

@@ -1,81 +0,0 @@
-#!/bin/bash
-
-#/ NAME
-#/     edit-gem -- set environment to hint to Gemfile to use a local gemspec
-#/
-#/ SYNOPSIS
-#/     edit gem <name> [location]
-#/     edit gem -r <names>
-#/     edit gem -R
-
-# figure out the project root under which bin, lib live
-shome="$(unset CDPATH; cd -P -- "$(dirname -- "$BASH_SOURCE")/.." && pwd -P)"
-
-# load a jason bourne library
-source "$shome/libexec/_jason"
-
-# define command line options:
-DEFINE_boolean "update" "$FLAGS_FALSE" "finish editing a local gem and updates project" "u"
-DEFINE_boolean "reset" "$FLAGS_FALSE" "reset gem to remote" "r"
-DEFINE_boolean "resetall" "$FLAGS_FALSE" "reset all gems to remote" "R"
-
-# entry point
-function main {
-  if [[ "$FLAGS_resetall" = "$FLAGS_TRUE" ]]; then
-    set +f
-    rm -f $shome/.local/*
-    set -f
-    bundle --local --quiet && bundle check > /dev/null
-    git diff --no-ext-diff Gemfile.lock vendor/cache
-  elif [[ "$FLAGS_reset" = "$FLAGS_TRUE" ]]; then
-    local nm_gem
-    for nm_gem in "$@"; do
-      rm -f "$shome/.local/$nm_gem"
-    done
-
-    bundle --local --quiet && bundle check > /dev/null
-
-    git diff --no-ext-diff Gemfile.lock vendor/cache
-  elif [[ "$FLAGS_update" = "$FLAGS_TRUE" ]]; then
-    local nm_gem
-    for nm_gem in "$@"; do
-      echo -n > "$shome/.local/$nm_gem"
-    done
-
-    bundle update "$@"
-
-    for nm_gem in "$@"; do
-      rm -f "$shome/.local/$nm_gem"
-    done
-    bundle --local --quiet && bundle check > /dev/null
-
-    git add Gemfile.lock vendor/cache
-    git add -u vendor/cache
-    git diff --no-ext-diff --cached Gemfile.lock vendor/cache
-  else
-    local nm_gem="$1"; shift
-
-    local pth_gem
-    if [[ "$#" = 0 ]]; then
-      pth_gem="gems/$nm_gem"
-    else
-      pth_gem="$1"; shift
-    fi
-    
-    if [[ ! -d "$pth_gem" ]]; then
-      logger_fatal "cannot find local gem directoy at $pth_gem"
-      exit 1
-    fi
-
-    pth_gem="$(unset CDPATH; cd -P -- "$pth_gem" && pwd -P)"
-
-    echo "enabling local gem development on ${nm_gem} at ${pth_gem}"
-    mkdir -p "$shome/.local"
-    echo "$pth_gem" > "$shome/.local/$nm_gem"
-
-    bundle --local --quiet && bundle check > /dev/null
-    git diff --no-ext-diff Gemfile.lock vendor/cache
-  fi
-}
-
-require sub "$BASH_SOURCE" "$@"