stack 0.0.1 → 0.0.2

data/Rakefile

@@ -10,7 +10,9 @@ begin
     gem.email = "dev@sixones.com"
     gem.homepage = "http://github.com/sixones/stack"
     gem.authors = ["sixones"]
+    gem.files = FileList['lib/**/*.rb', 'bin/*', '[A-Z]*', 'test/**/*'].to_a
     gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
+
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
 rescue LoadError
@@ -43,10 +45,20 @@ task :default => :test
 
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+  if File.exist?('VERSION.yml')
+    config = YAML.load(File.read('VERSION.yml'))
+    version = "#{config[:major]}.#{config[:minor]}.#{config[:patch]}"
+  else
+    version = ""
+  end
 
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title = "stack #{version}"
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
+
+desc "provide a console like merb -i or script/console"
+task :console do
+  exec "irb -r irb/completion -r lib/stack.rb"
+end

data/VERSION.yml

@@ -0,0 +1,4 @@
+--- 
+:major: 0
+:minor: 0
+:patch: 2

data/bin/stack

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+require 'stack'
 
-require 'optparse'
-require 'stack'
+Stack::runner = Stack::Runner.new(ARGV)
+Stack::runner.run!

data/lib/core_ext/hash.rb

@@ -0,0 +1,63 @@
+class Hash
+
+  # Returns a new hash just like this one, but with all the string keys expressed as symbols.
+  # Also applies to hashes within self.
+  # Based on an implementation within Rails 2.x, thanks Rails!
+  def deep_symbolize
+    target = dup    
+    target.inject({}) do |memo, (key, value)|
+      value = value.deep_symbolize if value.is_a?(Hash)
+      memo[(key.to_sym rescue key) || key] = value
+      memo
+    end
+  end
+  
+  # Subtracts one hash from another by removing keys from the actor and recursing on any hash values.
+  # Returns a new Hash without affecting the actors.
+  # Example 1:
+  # {:foo=>"bar"} - {:foo=>"bar"} == {}
+  # Example 2 of deep nesting:
+  # {:foo=>{:bar=>"baz", :car=>"naz"}, :bar=>"baz"} - {:foo=>{:car=>"naz"}} == {:foo=>{:bar=>"baz"}, :bar=>"baz"}
+  def -(arg)
+    target = dup; actor = arg.dup
+    actor.each do |key, value|
+      if value.is_a?(Hash)
+        target[key] = target[key] - value
+      else
+        target.delete(key)
+      end
+    end
+    return target
+  end
+  
+  # Returns a new hash just like this one, but with all STRING keys and values evaluated
+  # and rendered as liquid templates using the provided payload hash.
+  def deep_liquify(payload={})
+    target = dup
+    target.inject({}) do |memo, (key, value)|
+      value = value.deep_liquify(payload) if value.is_a?(Hash)
+      value = value.liquify(payload) if value.is_a?(String)
+      key = key.liquify(payload) if key.is_a?(String)
+      memo[(key.to_sym rescue key) || key] = value
+      memo
+    end
+  end
+    
+  # Merges self with another hash, recursively.
+  # 
+  # This code was lovingly stolen from some random gem:
+  # http://gemjack.com/gems/tartan-0.1.1/classes/Hash.html
+  # 
+  # Thanks to whoever made it.
+  def deep_merge(hash)
+    target = dup    
+    hash.keys.each do |key|
+      if hash[key].is_a? Hash and self[key].is_a? Hash
+        target[key] = target[key].deep_merge(hash[key])
+        next
+      end      
+      target[key] = hash[key]
+    end    
+    target
+  end
+end

data/lib/stack/configuration.rb

@@ -0,0 +1,16 @@
+module Stack
+  class Configuration
+    attr_accessor :source, :target
+    
+    def initialize(hash = nil)
+      self.from_hash(hash)
+    end
+    
+    def from_hash(hash)
+      if (hash != nil)
+        @source = hash[:source]
+        @target = hash[:target]
+      end
+    end
+  end
+end

data/lib/stack/generator.rb

@@ -0,0 +1,16 @@
+module Stack
+  class Generator
+    def initialize
+      puts "Source -> #{Stack::runner.configuration.source}"
+      
+      # read layouts
+      # read "objects"
+      # read pages
+      # write pages
+    end
+    
+    def layouts
+      
+    end
+  end
+end

data/lib/stack/runner.rb

@@ -0,0 +1,42 @@
+module Stack
+  class Runner
+    attr_accessor :configuration
+    attr_accessor :command
+    attr_accessor :arguments
+    
+    def initialize(argv)
+      @argv = argv
+      @options = { }
+      
+      parse!
+    end
+    
+    # Parse options, command and arguments 
+    def parse!
+      options = Stack::parse! @argv
+      
+      @configuration = Stack::Configuration.new(options)
+      
+      @command = @argv.shift
+      @arguments = @argv
+    end
+    
+    # Run stack!
+    def run!
+      if @command.nil?
+        @command = "generate"
+      end
+      
+      if Stack::COMMANDS.include?(@command)
+        run_command
+      else
+        abort "Unknown command: #{@command}. Use one of #{Stack::COMMANDS.join(", ")}."
+      end
+    end
+    
+    # Runs the specified command 
+    def run_command
+      Stack::Generator.new
+    end
+  end
+end

data/lib/stack.rb

@@ -1,28 +1,82 @@
 # rubygems
 require 'rubygems'
+require 'optparse'
+
+require 'core_ext/hash'
+
+require 'stack/configuration'
+require 'stack/generator'
+require 'stack/runner'
 
 module Stack
-  # Default options used by stack, overridden from the command line or stack configration file.
+  # Default options used by stack, overridden from the command line or YML configration file.
   DEFAULTS = {
-    
+    :source => '.',
+    :target => File.join('.', '_stack')
   }.freeze
   
+  # Array of valid commands stack can use
+  COMMANDS = %w(create generate server)
+  
+  class << self
+    attr_accessor :runner
+  end
+  
+  # Parses the options configuration from the command line
+  def self.parse!(argv)
+    config = { }
+    
+    parser = OptionParser.new do |opts|
+      opts.banner = "Usage: stack [options] #{Stack::COMMANDS.join('|')}"
+
+      opts.on("-s", "--source [DIR]", "Directory to use as the source for generating a stack") do |l| config[:source] = l unless l.nil? end
+      opts.on("-t", "--target [DIR]", "Directory to use as the target directory") do |l| config[:target] = l unless l.nil? end
+      
+      opts.on_tail("-h", "--help", "Show this message") { puts opts; exit }
+      opts.on_tail("-v", "--version" "Show version") do puts "stack #{Stack::version}"; exit; end
+    end
+    
+    parser.parse! argv
+    
+    options = Stack::configuration(config)
+    
+    options
+  end
+  
+  # Merges the configuration from YAML file, command line and defaults
   def self.configuration(override)
     config = { }
+    source = File.join(override['source'] || Stack::DEFAULTS[:source])
+    
+    config_file = File.join(source, "_stack.yml")
     
     begin
-      #config = YAML.load_file(config_file)
-    rescue => error
+      yml = YAML.load_file(config_file)
       
+      raise "Invalid configuration - #{config_file}" if !config.is_a?(Hash)
+      
+      yml.each { |key, value| config[key.to_sym] = value }
+      
+      STDOUT.puts "Configuration loaded from #{config_file}"
+    rescue => error
+      STDERR.puts "WARNING: Could not read configuration. Using defaults (and options)."
+      STDERR.puts "\t" + error.to_s
     end
     
     # Merge configuration with defaults
-    Stack::DEFAULTS.deep_merge(config).deep_merge(override)
+    Stack::DEFAULTS.deep_merge(override).deep_merge(config)
   end
   
   # Stacks current version
   def self.version
-    yml = YAML.load(File.read(File.join(File.dirname(__FILE__), *%w[.. VERSION.yml])))
-    "#{yml[:major]}.#{yml[:minor]}.#{yml[:patch]}"
+    version_file = File.join(File.dirname(__FILE__), *%w[.. VERSION.yml])
+    
+    if File.exist?(version_file)
+      yml = YAML.load(File.read(version_file))
+    
+      "#{yml[:major]}.#{yml[:minor]}.#{yml[:patch]}"
+    else
+      "0.0.0"
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: stack
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - sixones
@@ -32,13 +32,16 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files: 
-- .document
-- .gitignore
 - LICENSE
 - README.rdoc
 - Rakefile
-- VERSION
+- VERSION.yml
+- bin/stack
+- lib/core_ext/hash.rb
 - lib/stack.rb
+- lib/stack/configuration.rb
+- lib/stack/generator.rb
+- lib/stack/runner.rb
 - test/helper.rb
 - test/test_stack.rb
 has_rdoc: true

data/.document

@@ -1,5 +0,0 @@
-README.rdoc
-lib/**/*.rb
-bin/*
-features/**/*.feature
-LICENSE

data/.gitignore

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC

data/VERSION

@@ -1 +0,0 @@
-0.0.1