bakery 0.5.2 → 0.5.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: d001b25a0716c7ab96780deca1e08228a035e240
+  data.tar.gz: c6cf1c71a1b55e82417d0ae9a2110e021e12e941
+SHA512:
+  metadata.gz: 630cf0b3f10a87e58ea8066806b18ac299b4a2464d62658bb6c60081550a1c2380a29a75925be68aa91fc923fa4f0ada446caf4a7c15aa7a8350353bce976fbd
+  data.tar.gz: aaad39147a79f36a370fa2a2cc631bb36eb1f9ccbf6fd4efd8f75a5e7a7b3bd11e571a2c5c136e9aabcc2eb7cc5a53d3446d132e23e7a9201934b242c1e25b58

data/bin/bake

@@ -59,6 +59,8 @@ bake_init = Proc.new do
     puts e
     Bakery::Log.error "failure"
   end
+
+  Bakery.removeCake
 end
 
 if opts[:destination]

data/lib/bakery.rb

@@ -9,15 +9,17 @@
 # <description>
 #
 
-require 'bakery/bakery'
 require 'bakery/cake'
+require 'bakery/dsl'
+require 'bakery/ingredient'
+
+require 'bakery/detail/dispatcher'
 require 'bakery/detail/global_function'
+require 'bakery/detail/icing'
 require 'bakery/detail/load'
 require 'bakery/detail/log'
-require 'bakery/detail/dispatcher'
+require 'bakery/detail/marker'
 require 'bakery/detail/search'
-require 'bakery/icing'
-require 'bakery/ingredient'
 
 module Bakery
   ROOT_DIR = Dir.pwd

data/lib/bakery/cake.rb

@@ -10,6 +10,8 @@
 #
 
 module Bakery
+  @currentCake = nil
+
   class Cake
     def initialize parent
       @parent = parent
@@ -29,5 +31,25 @@ module Bakery
       @parent
     end
   end
+
+  class << self
+    def addCake
+      cake = Cake.new @currentCake
+
+      Bakery::Log.debug "entering project: #{cake.root}"
+
+      @currentCake = cake
+    end
+
+    def removeCake
+      Bakery::Log.debug "leaving project: #{@currentCake.root}"
+
+      @currentCake = @currentCake.parent
+    end
+
+    def getCake
+      @currentCake
+    end
+  end
 end
 

data/lib/bakery/detail/icing.rb

@@ -0,0 +1,29 @@
+#
+# Copyright (c) 2013
+# Nathan Currier
+#
+# Use, modification, and distribution are all subject to the
+# Boost Software License, Version 1.0. (See the accompanying
+# file LICENSE.md or at http://rideliner.tk/LICENSE.html).
+#
+# <description>
+#
+
+module Bakery
+  @globalIcing = Hash.new
+
+  class << self
+    def icing
+      @globalIcing
+    end
+
+    def [] symbol
+      if icing = getCake.icing[symbol]
+        icing
+      else
+        @globalIcing[symbol]
+      end
+    end
+  end
+end
+

data/lib/bakery/{bakery.rb → detail/marker.rb}

@@ -10,10 +10,7 @@
 #
 
 module Bakery
-  @cakes = Array.new
   @markers = Array.new
-  @defaultIcing = Hash.new
-  @currentCake = nil
 
   class << self
     def removeMarkerLayerFromStack path
@@ -27,12 +24,6 @@ module Bakery
 
         removed
       }
-
-      if @currentCake.root == path
-        Bakery::Log.debug "leaving project: #{@currentCake.root}"
-
-        @currentCake = @currentCake.parent
-      end
     end
 
     def getLatestMarkerOfType type
@@ -45,38 +36,9 @@ module Bakery
       nil
     end
 
-    def icing
-      @defaultIcing
-    end
-
     def markers
       @markers
     end
-
-    def cakes
-      @cakes
-    end
-
-    def [] symbol
-      if icing = getCake.icing[symbol]
-        icing
-      else
-        @defaultIcing[symbol]
-      end
-    end
-
-    def addCake
-      cake = Cake.new @currentCake
-
-      Bakery::Log.debug "entering project: #{cake.root}"
-
-      @cakes.push cake
-      @currentCake = cake
-    end
-
-    def getCake
-      @currentCake
-    end
   end
 end
 

data/lib/bakery/ingredients/detail/project.ingredient

@@ -38,6 +38,8 @@ module Bakery
           end
 
           dispatch &block
+
+          Bakery.removeCake
         end
       end
     end

data/lib/bakery/version.rb

@@ -10,6 +10,6 @@
 #
 
 module Bakery
-  VERSION = '0.5.2'
+  VERSION = '0.5.3'
 end
 

metadata

@@ -1,30 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: bakery
 version: !ruby/object:Gem::Version
-  version: 0.5.2
-  prerelease: 
+  version: 0.5.3
 platform: ruby
 authors:
 - Nathan Currier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-11 00:00:00.000000000 Z
+date: 2013-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '2.0'
 description: Design the layout of a project and have it ready for coding.
@@ -49,11 +46,12 @@ files:
 - lib/bakery/detail/global_function.rb
 - lib/bakery/detail/search.rb
 - lib/bakery/detail/dispatcher.rb
+- lib/bakery/detail/icing.rb
 - lib/bakery/detail/log.rb
+- lib/bakery/detail/marker.rb
 - lib/bakery/ingredient.rb
-- lib/bakery/icing.rb
-- lib/bakery/bakery.rb
 - lib/bakery/cake.rb
+- lib/bakery/dsl.rb
 - lib/default.ingredients
 - lib/bakery.rb
 - LICENSE.md
@@ -61,26 +59,25 @@ files:
 homepage: https://github.com/rideliner/bakery
 licenses:
 - Boost
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Project management made simple.
 test_files: []