architecture-js 0.1.3 → 0.1.4

data/.travis.yml

@@ -0,0 +1 @@
+rvm: 1.9.2

data/README.md

@@ -1,8 +1,8 @@
-# architecture-js
+# architecture-js [![Build Status](https://secure.travis-ci.org/daytonn/architecture-js.png)](http://travis-ci.org/daytonn/architecture-js)
 
 ##About
 
-Architecture.js is a suite of tools to help you build and manage complex javascript applications and frameworks. With architecture.js you can create project scaffolding, manage third-party packages, compile, and compress your javascript application, all in real time as you write plain old vanilla javascript. In addition to large applications, architecture.js is perfect for developing your own javascript frameworks. 
+ArchitectureJS is a suite of tools to help you build and manage complex javascript applications and frameworks. With ArchitectureJS you can create project scaffolding, manage third-party packages, compile, and compress your javascript application, all in real time as you write plain old vanilla javascript. In addition to large applications, ArchitectureJS is perfect for developing your own javascript frameworks and libraries. 
 
 ###contributing to architecture.js
  
@@ -14,7 +14,7 @@ Architecture.js is a suite of tools to help you build and manage complex javascr
 * Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
 * Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
 
-== Copyright
+##Copyright
 
 Copyright (c) 2011 Dayton Nolan. See LICENSE.txt for
 further details.

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/architecture-js.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "architecture-js"
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dayton Nolan"]
-  s.date = "2011-12-28"
+  s.date = "2012-01-28"
   s.description = "Architecture.js helps you generate scaffolding, manage third-party packages, compile, and compress your application."
   s.email = "daytonn@gmail.com"
   s.executables = ["architect"]
@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".DS_Store",
     ".document",
+    ".travis.yml",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
@@ -29,6 +30,7 @@ Gem::Specification.new do |s|
     "architecture-js.gemspec",
     "bin/architect",
     "lib/architecture-js.rb",
+    "lib/architecture-js/architect.rb",
     "lib/architecture-js/command.rb",
     "lib/architecture-js/dependencies.rb",
     "lib/architecture-js/generator.rb",
@@ -39,21 +41,26 @@ Gem::Specification.new do |s|
     "spec/architecture-js_spec.rb",
     "spec/cli_spec.rb",
     "spec/command_spec.rb",
+    "spec/fixtures/.DS_Store",
     "spec/fixtures/compiled_src.js",
-    "spec/fixtures/ejs_template.ejs",
+    "spec/fixtures/compressed.architecture",
+    "spec/fixtures/compressed.js",
+    "spec/fixtures/ejs.ejs",
     "spec/fixtures/existing.architecture",
     "spec/fixtures/lib1.js",
     "spec/fixtures/lib2.js",
     "spec/fixtures/myapp.architecture",
     "spec/fixtures/src_file.js",
-    "spec/fixtures/test_template.erb",
-    "spec/fixtures/test_template.js",
+    "spec/fixtures/templates/test_template_one.js",
+    "spec/fixtures/templates/test_template_two.js",
     "spec/fixtures/test_template_options.js",
+    "spec/fixtures/test_template_two.js",
     "spec/generator_spec.rb",
     "spec/helpers_spec.rb",
     "spec/notification_spec.rb",
     "spec/project_spec.rb",
-    "spec/spec_helper.rb"
+    "spec/spec_helper.rb",
+    "templates/blank.js"
   ]
   s.homepage = "http://github.com/daytonn/architecture.js"
   s.licenses = ["MIT"]

data/bin/architect

@@ -1,214 +1,4 @@
 #!/usr/bin/env ruby
-
 $: << File.expand_path(File.join(File.dirname(__FILE__), "../lib"))
-
-begin
-  require 'architecture-js'
-  require 'optparse'
-rescue LoadError
-  require 'rubygems'
-  require 'architecture-js'
-  require 'optparse'
-end
-
-create = <<-CREATE
-  create    Creates a new architecture-js application in the current working 
-            directory or sub directory within.
-        
-            Arguments:
-            application name - Name of the architecture-js application
-            subdirectory* - Directory where the application will be 
-                            installed (created if non existent)
-                                    
-            examples:
-            architect create myapp
-            architect create myapp subdirectory
-CREATE
-
-generate = <<-GEN
-  generate  Generates scoffolding for the given component file type. 
-
-            Arguments:
-            type - Type of application scaffold to create (module, elements, model).
-            name* - Name of the module to generate the scaffold for
-
-            Options:
-            -a, --alias name* - Create an alias of the application object
-                                (defaults to "app"), passing a name is optional
-            -e, --elements - Generate an elements file
-            -m, --model - Generate a model file 
-
-            examples:
-            architect generate module mymodule -em (generates module, elements and model)
-            architect generate module mymodule -a (generates an application alias)
-            architect generate elements mymodule -m (generates an elements and a model file)
-            architect generate model mymodule (generates an model file)
-GEN
-
-compile = <<-COMP
-  compile   Compiles the architecture-js project in the current working directory.
-  
-            Options:
-            -c, --compress - Compress output with JsMin
-          
-            example:
-            architect compile
-COMP
-
-watch = <<-WATCH
-  watch     Watches the current working directory for file changes and
-            compiles when changes are detected.
-          
-            example:
-            architect watch
-WATCH
-
-upd = <<-UPDATE
-  update   Updates your application's core files to the latest version.
-UPDATE
-
-footer = <<-FOOTER
-* optional argument
-FOOTER
-
-help = {
-  create: create,
-  generate: generate,
-  compile: compile,
-  watch: watch,
-  update: upd,
-  footer: footer
-}
-
-command = ARGV[0]
-
-options = {
-  alias: nil,
-  elements: false,
-  model: false,
-  help: false,
-  compress: nil
-}
-
-optparse = OptionParser.new do |opts|
-  opts.on( '-h', '--help', 'Display this screen' ) do
-    options[:help] = true
-  end
-  
-  opts.on( '-v', '--version', 'Display the version') do
-    time = Time.now
-    puts ArchitectureJS::Notification.notice 'architect ' + ArchitectureJS::VERSION
-    puts ArchitectureJS::Notification.notice "Copyright (c) #{time.year} Dayton Nolan"
-    puts ArchitectureJS::Notification.notice "Released under the MIT License"
-    exit
-  end
-  
-  opts.on( '-a', '--alias [alias]', 'Generate application alias') do |als|
-    options[:alias] = als || "app"
-  end
-  
-  opts.on( '-d', '--dest [dest]', 'Module destination directory') do |dest|
-    options[:dest] = dest
-  end
-  
-  opts.on('-e', '--elements', 'Generate elements file') do
-    options[:elements] = true
-  end
-  
-  opts.on('-m', '--model', 'Generate model file') do
-    options[:model] = true
-  end
-  
-  opts.on('-c', '--compress', 'Compress with JsMin') do
-    options[:compress] = true
-  end
-end
-
-optparse.parse!
-
-case command
-# create
-  when "create"
-    if options[:help]
-      puts help[:create]
-      exit
-    end
-    app_name = ARGV[1]
-    sub_dir = ARGV[2] || nil
-    
-    if app_name.nil?
-      puts "Error! Application name is required (architect create app_name)"
-      exit
-    end
-    
-    config = { name: app_name }
-    config[:root] = sub_dir unless sub_dir.nil?
-    ArchitectureJS::Command.create(config)
-# generate
-  when "generate"
-    if options[:help]
-      puts help[:generate]
-      exit
-    end
-    
-    errors = Hash.new
-    type = ARGV[1]
-    name = ARGV[2]
-    als = options[:alias] || nil
-    dest = options[:dest] || nil
-
-    errors[:type] = "Error! Scaffold type is required (architect generate module mymodule)" if type.nil?
-    errors[:name] = "Error! Module name is required (architect generate module mymodule)" if name.nil?
-    
-    unless errors.empty?
-      errors.each do |error|
-        puts error
-      end
-      exit
-    end
-    
-    dependencies = {
-        model: options[:model],
-        elements: options[:elements]
-    }
-    
-    ArchitectureJS::Command.generate({
-      project: ArchitectureJS::Project.new,
-      type: type,
-      name: name,
-      alias: als,
-      dest: dest,
-      dependencies: dependencies
-    })
-# compile
-  when "compile"
-    if options[:help]
-      puts help[:compile]
-      exit
-    end
-    
-    if options[:compress]
-      ArchitectureJS::Command.compile
-    else
-      ArchitectureJS::Command.compile({ force_compress: options[:compress] })
-    end
-# watch
-  when "watch"
-    if options[:help]
-      puts help[:watch]
-      exit
-    end
-    ArchitectureJS::Command.watch
-# update
-  when "update"
-    if options[:help]
-      puts help[:update]
-      exit
-    end
-    ArchitectureJS::Command.update
-  else
-    help.each do |section|
-      puts section.last + "\n"
-    end
-    exit
-  end
+require 'architecture-js'
+Architect::application.run

data/lib/architecture-js/architect.rb

@@ -0,0 +1,174 @@
+module Architect
+
+  class << self
+
+    def application
+      @application ||= Architect::Application.new
+    end
+
+  end
+
+  class Application
+
+    attr_reader :args,
+                :command,
+                :commands,
+                :options,
+                :subcommands
+
+    def initialize
+      @command = ARGV[0].to_sym if ARGV[0]
+      @args = Array.try_convert(ARGV)
+      @args.shift
+      @options = {}
+      @subcommands = {}
+      @commands = [:create, :generate, :compile, :watch]
+      @help = create_help
+    end
+
+    def run
+      parse_args unless @args.empty?
+      if @command
+        if options[:h]
+          help @command
+        else
+          if @commands.include? @command
+            self.send @command
+          else
+            puts ArchitectureJS::Notification.error "#{@command} is not a valid command"
+          end
+        end
+      else
+        help
+      end
+    end
+
+    def create
+      app_name = @args[0]
+      sub_dir = @args[1] || nil
+
+      if app_name.nil?
+        puts "Error! Application name is required (architect create app_name)"
+        exit
+      end
+    
+      config = { name: app_name }
+      config[:root] = sub_dir unless sub_dir.nil?
+      ArchitectureJS::Command.create(config)
+    end
+
+    def generate
+      puts 'To be implemented'
+    end
+
+    def compile
+      if options[:c] || options[:compress]
+        ArchitectureJS::Command.compile
+      else
+        ArchitectureJS::Command.compile({ force_compress: true })
+      end
+    end
+
+    def watch
+      ArchitectureJS::Command.watch
+    end
+
+    private
+      def parse_args
+        @args.each_index do |i|
+          if @args[i] =~ /^\-/
+            parse_flag @args[i]
+          elsif args[i] =~ /\:/
+            parse_key_value_pair @args[i]
+          else
+            add_subcommand @args[i], i
+          end
+        end
+      end
+
+      def parse_flag(arg)
+        key = arg.gsub(/^\-+/, '')
+        @options[key] = true
+        @options[key.to_sym] = true
+      end
+
+      def parse_key_value_pair(arg)
+        m = arg.match(/([\w|\-|]+)\:(\"|\')?(.*)(\"|\')?/)
+        key = m.captures[0]
+        value = m.captures[2]
+        @options[key] = value
+        @options[key.to_sym] = value
+      end
+
+      def add_subcommand(arg, index)
+        #@subcommands[arg] = [sub args]
+      end
+
+      def help(command = nil)
+        help = command || [*@commands, :footer]
+        [*help].each do |command|
+          puts @help[command]
+        end
+      end
+
+      def create_help
+        help = {}
+        help[:create] = <<-CREATE
+            create    Creates a new architecture-js application in the current working 
+                      directory or sub directory within.
+
+                      Arguments:
+                      application name - Name of the architecture-js application
+                      subdirectory* - Directory where the application will be 
+                                      installed (created if nonexistent)
+
+                      examples:
+                      architect create myapp
+                      architect create myapp subdirectory
+        CREATE
+      
+        help[:generate] = <<-GEN
+            generate  Generates scoffolding from a template. 
+
+                      Arguments:
+                      name - Name of the template to generate
+
+                      Options:
+                      *Options are arbitrary (optional) arguments specific to templates
+                      There are two types of options: boolean and named attributes
+
+                      examples:
+                      architect generate mytemplate -f (boolean arguments use a single "-")
+                      architect generate mytemplate foo:"Hello" (named arguments can be boolean by passing no value)
+                      architect genreate mymodule -f foo:"Hello" (combined to generate complex templates)
+        GEN
+
+        help[:compile] = <<-COMP
+          compile   Compiles the architecture-js project in the current working directory.
+
+                    Options:
+                    -c, --compress - Compress output with JsMin
+
+                    example:
+                    architect compile
+        COMP
+
+        help[:watch] = <<-WATCH
+          watch     Watches the current working directory for file changes and
+                    compiles when changes are detected.
+          
+                    example:
+                    architect watch
+        WATCH
+
+        help[:footer] = <<-FOOTER
+
+        * optional argument
+        
+        FOOTER
+
+        help
+      end
+  end
+
+end

data/lib/architecture-js/command.rb

@@ -6,11 +6,10 @@ module ArchitectureJS
       path ||= File.expand_path(Dir.getwd)
 
       puts ArchitectureJS::Notification.log "ArchitectureJS are watching for changes. Press Ctrl-C to stop."
-      project = ArchitectureJS::Project.new({ name: 'unknown' }, path)
-      project.read_config
+      project = ArchitectureJS::Project::new_from_config(path)
       project.update
       watch_hash = Hash.new
-
+      puts project.watch_directories
       project.watch_directories.each do |dir|
         watch_hash["#{path}/#{dir}"] = "**/*.js"
       end

data/lib/architecture-js/generator.rb

@@ -1,44 +1,51 @@
 module ArchitectureJS
   class Generator
 
-    attr_reader :template_paths,
-                :templates,
-                :project
+    attr_accessor :template_paths,
+                  :templates,
+                  :project
 
     def initialize(project)
       @project = project
       @template_paths = @project.template_directories
       @templates = Hash.new
       find_templates @template_paths
-      #@template_dir = template_dir
-      #@template_files = Dir.entries(template_dir).reject {|file| file.match /^\./ }
-      #@templates = Hash.new
-      #@template_files.each do |file|
-      #  name = file.gsub /\.\w+$/, ''
-      #  @templates[name] = ERB.new(File.read(File.expand_path(file, @template_dir)))
-      #end
     end
 
     def find_templates(paths)
       paths.each do |path|
-        Dir["#{path}/*_template*"].each do |file|
-          template_name = get_template_name file
-          @templates[template_name] = get_template(file)
+        Dir["#{path}/*"].each do |file|
+          add_file_to_templates file          
         end
       end
     end
 
-    def get_template_name(file)
-      file.split(/\/|\\/).last.gsub(/_template\.\w*/, '')
+    def add_file_to_templates(file)
+      ext = File.extname(file)
+      template_name = File.basename(file, ext)
+      @templates[template_name] = {
+        erb: read_template(file),
+        ext: ext
+      }
     end
 
-    def get_template(file)
+    def read_template(file)
       ERB.new File.read(file)
     end
 
+    def generate(template, filename, options)
+      filename = "#{filename}#{@templates[template][:ext]}"
+      generate_file(filename, render_template(template, options), path)
+    end
+
+    def generate_file(filename, template, path = nil)
+      path ||= File.expand_path(Dir.getwd)
+      File.open("#{path}/#{filename}", "w+") { |f| f.write template }
+    end
+
     def render_template(template, options = nil)
       project = @project
-      @templates[template].result(binding)
+      @templates[template][:erb].result(binding)
     end
   end
 end

data/lib/architecture-js/project.rb

@@ -1,19 +1,31 @@
 module ArchitectureJS
-  class Project # TODO make generator belong to project to have default templates hooked up to generator
-    attr_reader :root,
-                :src_files,
-                :framework,
-                :config_name,
-                :watch_directories,
-                :directories,
-                :template_directories,
-                :generator
-
-    attr_accessor :config
+  class Project
+    attr_accessor :root,
+                  :src_files,
+                  :framework,
+                  :config_name,
+                  :watch_directories,
+                  :directories,
+                  :template_directories,
+                  :generator,
+                  :config
 
     # this line adds the default framework to ArchitectureJS
     ArchitectureJS::register_framework 'none', self
 
+    def self.new_from_config(path)
+      config_file = Dir.entries(path).select {|f| f =~ /\.architecture$/ }.first
+
+      raise ".architecture file was not found in #{path}" if config_file.nil?
+
+      config = YAML::load_file "#{path}/#{config_file}"
+      config = ArchitectureJS::Helpers::symbolize_keys config
+
+      raise "#{config[:framework]} is unavailable or not installed" if ArchitectureJS::FRAMEWORKS[config[:framework]].nil?
+
+      project = ArchitectureJS::FRAMEWORKS[config[:framework]].new config, path
+    end
+
     def initialize(config, root = nil)
       raise "#{self.class}.new({ name: 'myapp' }, options): config[:name] is undefined" unless config[:name]
       @config_file = "#{config[:name].downcase}.architecture"
@@ -35,7 +47,7 @@ module ArchitectureJS
     end
   
     def read_config
-      config = YAML.load_file("#{@root}/#{@config_file}")
+      config = YAML::load_file("#{@root}/#{@config_file}")
       assign_config_variables config
     end
 
@@ -79,7 +91,7 @@ module ArchitectureJS
     def update
       get_src_files
       compile_src_files
-      compress_application if @output == 'compressed'
+      compress_application if @config[:output] == 'compressed'
       puts ArchitectureJS::Notification.log "application updated" unless @errors
       @errors = false
     end
@@ -123,15 +135,14 @@ module ArchitectureJS
     end
 
     def compress_application
-      app_root = File.expand_path "#{@config[:build_dir]}"
-      src_files = Dir.entries(app_root)
-      src_files.reject! { |file| file =~ /^\./ }
+      app_root = File.expand_path "#{@root}/#{@config[:build_dir]}"
+      src_files = Dir.entries(app_root).reject! { |file| file =~ /^\./ }
 
-      src_files.each do |module_file|
-        full_path = "#{app_root}/#{module_file}"
+      src_files.each do |file|
+        full_path = "#{app_root}/#{file}"
         uncompressed = File.open(full_path, "r").read
-        File.open(full_path, "w+") do |module_file|
-          module_file << JSMin.minify(uncompressed)
+        File.open(full_path, "w+") do |file|
+          file << JSMin.minify(uncompressed).gsub(/\n?/, '')
         end
       end
     end

data/spec/cli_spec.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
-
+# TODO write tests for CLI
 describe 'CLI' do
   before :each do
     @bin = "#{ArchitectureJS::BASE_DIR}/bin/architect"
@@ -35,4 +35,8 @@ describe 'CLI' do
     "#{TMP_DIR}/lib/myapp.js".should be_same_file_as "#{FIXTURES}/compiled_src.js"
   end
 
+  it 'should generate a template' do
+    #suppress_output { %x`cd #{TMP_DIR}; #{@bin} generate blank test` }
+    #File.exists?("#{TMP_DIR}/test.js").should be_true
+  end
 end

data/spec/fixtures/compressed.architecture

@@ -0,0 +1,6 @@
+framework: none
+src_dir: src
+build_dir: lib
+asset_root: ../
+output: compressed
+name: myapp

data/spec/fixtures/compressed.js

@@ -0,0 +1 @@
+var file_one='one';var file_two='two';

data/spec/fixtures/test_template_two.js

@@ -0,0 +1,6 @@
+var myapp = (function() {
+  function myapp() {
+    
+  }
+  return myapp;
+})();

data/spec/generator_spec.rb

@@ -1,49 +1,46 @@
-require "spec_helper"
+require 'spec_helper'
 
 describe ArchitectureJS::Generator do
 
   before :each do
     FileUtils.mkdir TMP_DIR
     FileUtils.mkdir "#{TMP_DIR}/templates"
-    FileUtils.cp "#{FIXTURES}/test_template.erb", "#{TMP_DIR}/templates/test_template.erb"
-    FileUtils.cp "#{FIXTURES}/ejs_template.ejs", "#{TMP_DIR}/templates/ejs_template.ejs"
-    @gen = ArchitectureJS::Generator.new(ArchitectureJS::Project.new({ name: 'myapp' }, TMP_DIR))
+    FileUtils.cp "#{FIXTURES}/templates/test_template_one.js", "#{TMP_DIR}/test_template_one.js"
+    FileUtils.cp "#{FIXTURES}/templates/test_template_two.js", "#{TMP_DIR}/test_template_two.js"
+    project = ArchitectureJS::Project.new({ name: 'myapp' }, TMP_DIR)
+    project.template_directories = ["#{FIXTURES}/templates"]
+    @gen = ArchitectureJS::Generator.new(project)
   end
-  
+
   after :each do
     FileUtils.rm_rf TMP_DIR if File.exists? TMP_DIR
   end
 
-  it "should have a project" do
+  it 'should have a project' do
     @gen.project.class.should == ArchitectureJS::Project
   end
 
-  it "should have template_paths" do
-    @gen.template_paths.should == ["#{ArchitectureJS::BASE_DIR}/templates", "#{TMP_DIR}/templates"]
-  end
-
-  it "should get a template name" do
-    @gen.get_template_name("/Volumes/Storage/Development/architecture-js/spec/tmp/templates/ejs_template.ejs").should == 'ejs'
-    @gen.get_template_name("/Volumes/Storage/Development/architecture-js/spec/tmp/templates/test_template.erb").should == 'test'
+  it 'should have template_paths' do
+    @gen.template_paths.should == ["#{FIXTURES}/templates"]
   end
 
-  it "should find all the templates" do
-    @gen.templates['test'].should_not be_nil
-    @gen.templates['ejs'].should_not be_nil
+  it 'should find all the templates' do
+    @gen.templates['test_template_one'].should_not be_nil
+    @gen.templates['test_template_two'].should_not be_nil
   end
 
   it 'should render a template' do
-    @gen.render_template('test').should == File.open("#{FIXTURES}/test_template.js").read
+    @gen.render_template('test_template_one').should == File.open("#{FIXTURES}/templates/test_template_one.js").read
+    @gen.render_template('test_template_two').should == File.open("#{FIXTURES}/test_template_two.js").read
   end
 
   it 'should render a template with options' do
-    @gen.render_template('test', optional_variable: 'true').should == File.open("#{FIXTURES}/test_template_options.js").read
+    @gen.render_template('test_template_two', optional_variable: 'true').should == File.open("#{FIXTURES}/test_template_options.js").read
   end
 
-  it 'should render templates with different file extensions' do
-    @gen.templates['ejs'].is_a?(ERB).should be_true
-    @gen.render_template('ejs').should == File.open("#{FIXTURES}/test_template.js").read
-    @gen.render_template('ejs', optional_variable: 'true').should == File.open("#{FIXTURES}/test_template_options.js").read
+  it 'should generate a file from a template' do
+    @gen.generate_file("test.js", @gen.render_template("test_template_two"), TMP_DIR)
+    File.exists?("#{TMP_DIR}/test.js").should be_true
+    File.open("#{TMP_DIR}/test.js").read.should == File.open("#{FIXTURES}/test_template_two.js").read
   end
-
 end

data/spec/project_spec.rb

@@ -14,14 +14,14 @@ describe ArchitectureJS::Project do
       end
     end
 
-    it "should add the 'none' framework to ArchitectureJS" do
-      ArchitectureJS::FRAMEWORKS['none'].should == ArchitectureJS::Project
-    end
-
     after :each do
       FileUtils.rm_rf "#{TMP_DIR}" if File.exists? "#{TMP_DIR}"
     end
 
+    it "should add the 'none' framework to ArchitectureJS" do
+      ArchitectureJS::FRAMEWORKS['none'].should == ArchitectureJS::Project
+    end
+
     it 'should have an empty src_files array' do
       @project.src_files.should == Array.new
     end
@@ -49,9 +49,22 @@ describe ArchitectureJS::Project do
     it "should have a generator" do
       @project.generator.should_not be_nil
     end
+
+    context "with existing project" do
+      before(:each) do
+        FileUtils.cp("#{FIXTURES}/myapp.architecture", "#{TMP_DIR}/myapp.architecture")
+      end
+
+      it "should initialize with a config path" do
+        @existing = ArchitectureJS::Project.new_from_config TMP_DIR
+        @existing.config.should_not be_empty
+        @existing.config[:name].should == 'myapp'
+      end
+
+    end
   end # Instantiation
 
-  context "Project Creation" do
+  context "- Creation -" do
    before :each do
      FileUtils.mkdir("#{TMP_DIR}")
      suppress_output do
@@ -79,7 +92,7 @@ describe ArchitectureJS::Project do
    end
   end # Project Creation
 
-  context "Project Update" do
+  context "- Update -" do
     before :each do
       FileUtils.mkdir("#{TMP_DIR}")
       suppress_output do
@@ -98,9 +111,13 @@ describe ArchitectureJS::Project do
 
     it 'should compile the source files into the destination folder' do
       File.exists?("#{TMP_DIR}/lib/myapp.js").should be_true
-      "#{TMP_DIR}/lib/myapp.js".should be_same_file_as "#{FIXTURES}/compiled_src.js"
+      "#{TMP_DIR}/lib/myapp.js".should be_same_file_as "#{FIXTURES}/compressed.js"
     end
 
+    it 'should compress the application file' do
+      FileUtils.cp "#{FIXTURES}/compressed.architecture", "#{TMP_DIR}/myapp.architecture"
+      @project.config[:output].should == 'compressed'
+    end
   end # Project Update
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: architecture-js
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-28 00:00:00.000000000Z
+date: 2012-01-28 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fssm
-  requirement: &70124576688560 !ruby/object:Gem::Requirement
+  requirement: &70184953295460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70124576688560
+  version_requirements: *70184953295460
 - !ruby/object:Gem::Dependency
   name: jsmin
-  requirement: &70124576688060 !ruby/object:Gem::Requirement
+  requirement: &70184953294860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *70124576688060
+  version_requirements: *70184953294860
 - !ruby/object:Gem::Dependency
   name: sprockets
-  requirement: &70124576687580 !ruby/object:Gem::Requirement
+  requirement: &70184953294260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70124576687580
+  version_requirements: *70184953294260
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70124576663800 !ruby/object:Gem::Requirement
+  requirement: &70184953293520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70124576663800
+  version_requirements: *70184953293520
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70124576663220 !ruby/object:Gem::Requirement
+  requirement: &70184953292980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *70124576663220
+  version_requirements: *70184953292980
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70124576662580 !ruby/object:Gem::Requirement
+  requirement: &70184953292400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70124576662580
+  version_requirements: *70184953292400
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70124576661980 !ruby/object:Gem::Requirement
+  requirement: &70184953291780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70124576661980
+  version_requirements: *70184953291780
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70124576661420 !ruby/object:Gem::Requirement
+  requirement: &70184953291140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *70124576661420
+  version_requirements: *70184953291140
 - !ruby/object:Gem::Dependency
   name: ZenTest
-  requirement: &70124576660940 !ruby/object:Gem::Requirement
+  requirement: &70184953290540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 4.4.2
   type: :development
   prerelease: false
-  version_requirements: *70124576660940
+  version_requirements: *70184953290540
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70124576660380 !ruby/object:Gem::Requirement
+  requirement: &70184953289940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70124576660380
+  version_requirements: *70184953289940
 - !ruby/object:Gem::Dependency
   name: jsmin
-  requirement: &70124576659900 !ruby/object:Gem::Requirement
+  requirement: &70184953289340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70124576659900
+  version_requirements: *70184953289340
 - !ruby/object:Gem::Dependency
   name: fssm
-  requirement: &70124576659420 !ruby/object:Gem::Requirement
+  requirement: &70184953288740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70124576659420
+  version_requirements: *70184953288740
 - !ruby/object:Gem::Dependency
   name: sprockets
-  requirement: &70124576658940 !ruby/object:Gem::Requirement
+  requirement: &70184953288140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -153,7 +153,7 @@ dependencies:
         version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70124576658940
+  version_requirements: *70184953288140
 description: Architecture.js helps you generate scaffolding, manage third-party packages,
   compile, and compress your application.
 email: daytonn@gmail.com
@@ -166,6 +166,7 @@ extra_rdoc_files:
 files:
 - .DS_Store
 - .document
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -175,6 +176,7 @@ files:
 - architecture-js.gemspec
 - bin/architect
 - lib/architecture-js.rb
+- lib/architecture-js/architect.rb
 - lib/architecture-js/command.rb
 - lib/architecture-js/dependencies.rb
 - lib/architecture-js/generator.rb
@@ -185,21 +187,26 @@ files:
 - spec/architecture-js_spec.rb
 - spec/cli_spec.rb
 - spec/command_spec.rb
+- spec/fixtures/.DS_Store
 - spec/fixtures/compiled_src.js
-- spec/fixtures/ejs_template.ejs
+- spec/fixtures/compressed.architecture
+- spec/fixtures/compressed.js
+- spec/fixtures/ejs.ejs
 - spec/fixtures/existing.architecture
 - spec/fixtures/lib1.js
 - spec/fixtures/lib2.js
 - spec/fixtures/myapp.architecture
 - spec/fixtures/src_file.js
-- spec/fixtures/test_template.erb
-- spec/fixtures/test_template.js
+- spec/fixtures/templates/test_template_one.js
+- spec/fixtures/templates/test_template_two.js
 - spec/fixtures/test_template_options.js
+- spec/fixtures/test_template_two.js
 - spec/generator_spec.rb
 - spec/helpers_spec.rb
 - spec/notification_spec.rb
 - spec/project_spec.rb
 - spec/spec_helper.rb
+- templates/blank.js
 homepage: http://github.com/daytonn/architecture.js
 licenses:
 - MIT
@@ -215,7 +222,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3666074057750584530
+      hash: 1367257639939266064
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: