shipyard 0.0.1 → 0.0.2

data/bin/shipyard

@@ -3,5 +3,22 @@
 $:.unshift(File.dirname(__FILE__) + '/../lib/')
 require 'shipyard'
 
-builder = Shipyard::Builder.new('Manifest')
+MANIFEST_FILE = 'Manifest'
+
+def usage
+  puts <<-END
+Usage: shipyard <table name>
+  END
+end
+
+if ARGV.size != 1
+  usage
+  Process.exit(1)
+end
+
+if !File.exists?(MANIFEST_FILE)
+  puts "No Manifest file found in current directory."
+  Process.exit(2)
+end
+builder = Shipyard::Builder.new(MANIFEST_FILE, ARGV.first)
 builder.generate

data/lib/shipyard/builder.rb

@@ -7,13 +7,20 @@ module Shipyard
     attr_reader :table
     attr_reader :db
 
-    def initialize(manifest_file)
-      @manifest = Manifest.new(manifest_file)
+    def initialize(manifest_file, table)
+      @manifest = Manifest.new(manifest_file, table)
       @context = Context.new(@manifest)
     end
 
     def generate
-      Dir['*.erb'].each do |filename|
+      templates = Dir['*.erb']
+
+      templates.each do |template|
+        abort "No destination mapped for template '#{template}'" unless !!@manifest.destination_for(template)
+      end
+
+      puts "Rendering to output directory #{@manifest.output_dir}"
+      templates.each do |filename|
         open(filename) do |file|
           # pass in the context object and render the template
           template = ERB.new(file.read)
@@ -21,9 +28,13 @@ module Shipyard
           code = template.result(@context.get_binding)
           
           # write the rendered file to the associated destination
-          output_file = File.join(@manifest.output_dir, @manifest.destination_for(filename))
+          dst = @manifest.destination_for(filename)
+          output_file = File.join(@manifest.output_dir, dst)
           File.makedirs(File.dirname(output_file))
-          open(output_file, 'w') { |f| f.write(code) }
+          open(output_file, 'w') do |f|
+            puts "\t#{filename} => #{output_file}"
+            f.write(code)
+          end
         end
       end
     end

data/lib/shipyard/context.rb

@@ -5,17 +5,17 @@ class Context
 
   def initialize(manifest)
     @db = manifest.database
-    @table = manifest.table.to_s
+    @table = manifest.table
+    @row = manifest.row
     @dataset = @db[manifest.table]
-    @row = Inflector::singularize(manifest.table.to_s)
   end
 
   def columns
-    columns_with_types.keys.map(&:to_s)
+    @db.schema(@table.to_sym).map { |arr| arr[0].to_s }
   end
 
   def columns_with_types
-    @db.schema(@table.to_sym).inject({}) { |r, v| r[v[0].to_s] = v[1][:type].to_s; r }
+    @db.schema(@table.to_sym).inject({}) { |r, v| r[v[0].to_s] = v[1][:type]; r }
   end
 
   def primary_key

data/lib/shipyard/manifest.rb

@@ -1,17 +1,16 @@
+require 'active_support/inflector'
+
 module Shipyard
   class Manifest
-    attr_reader :maps
+    attr_reader :table, :row, :maps
 
-    def initialize(filename)
+    def initialize(filename, table)
+      @table = table
+      @row = ActiveSupport::Inflector.singularize(table)
       @maps = {} 
       open(filename) { |file| instance_eval(file.read) }
     end
 
-    def table(name = nil)
-      @table = name if !!name
-      @table
-    end
-
     def database(sequel = nil)
       @database = sequel if !!sequel
       @database

data/spec/context_spec.rb

@@ -6,18 +6,17 @@ module Shipyard
 
     before(:each) do
       @test_dir = 'test_manifest'
+      @test_table = 'users'
       Dir.mkdir(@test_dir)
       @test_manifest = File.join(@test_dir, 'Manifest')
       File.open(@test_manifest, 'w') do |file|
         file.write <<-EOF
-          table :test_table
-
           database Sequel.sqlite 
 
           map :test_template, 'controllers/test.rb'
         EOF
       end
-      @m = Manifest.new(@test_manifest)
+      @m = Manifest.new(@test_manifest, @test_table)
     end
 
     after(:each) do
@@ -28,27 +27,27 @@ module Shipyard
 
     it "should read the table name from the manifest" do
       ctx = Context.new(@m)
-      ctx.table.should == 'test_table' 
+      ctx.table.should == @test_table
     end
 
     it "should have a method to return the columns of the table" do
       ctx = Context.new(@m)
-      ctx.db.create_table :test_table do 
+      ctx.db.create_table @test_table.to_sym do 
         primary_key :id
         String :name
       end
-      ctx.columns.should == [:id, :name]
+      ctx.columns.should == ['id', 'name']
     end
 
     it "should have a method to return the columns with their types" do
       ctx = Context.new(@m)
-      ctx.db.create_table :test_table do 
+      ctx.db.create_table @test_table.to_sym do 
         primary_key :id
         column :name, :text
         column :count, :integer
       end
 
-      ctx.columns_with_types.should == {:id => :integer, :name => :string, :count => :integer}
+      ctx.columns_with_types.should == {'id' => :integer, 'name' => :string, 'count' => :integer}
     end
 
   end

data/spec/manifest_spec.rb

@@ -5,19 +5,18 @@ module Shipyard
 
     before(:each) do
       @test_db = 'test.db'
+      @test_table = 'users'
       @test_dir = 'test_manifest'
       Dir.mkdir(@test_dir)
       @test_manifest = File.join(@test_dir, 'Manifest')
       File.open(@test_manifest, 'w') do |file|
         file.write <<-EOF
-          table :test_table
-
           database Sequel.sqlite 
 
           map :test_template, 'controllers/test.rb'
         EOF
       end
-      @m = Manifest.new(@test_manifest)
+      @m = Manifest.new(@test_manifest, @test_table)
     end
 
     after(:each) do
@@ -26,8 +25,8 @@ module Shipyard
       @m = nil
     end
 
-    it "should read a table name from the manifest file" do
-      @m.table.should == :test_table
+    it "should take a table name in the constructor" do
+      @m.table.should == @test_table
     end
 
     it "should map template files to their output files" do

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: shipyard
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  hash: 27
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Chris Kite
@@ -9,29 +15,41 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-14 00:00:00 -05:00
+date: 2010-07-15 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 2
+        - 3
+        - 8
         version: 2.3.8
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: sequel
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 55
+        segments: 
+        - 3
+        - 12
+        - 0
         version: 3.12.0
-    version: 
+  type: :runtime
+  version_requirements: *id002
 description: 
 email: 
 executables: 
@@ -47,6 +65,9 @@ files:
 - lib/shipyard/manifest.rb
 - bin/shipyard
 - README.rdoc
+- spec/manifest_spec.rb
+- spec/context_spec.rb
+- spec/spec_helper.rb
 has_rdoc: true
 homepage: http://www.github.com/chriskite/shipyard
 licenses: []
@@ -60,21 +81,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Code generation tool for database-backed applications