architecture-js 0.1.11 → 0.1.12

data/Gemfile

@@ -3,6 +3,7 @@ source "http://rubygems.org"
 gem "fssm", "~> 0.2.8.1"
 gem "jsmin", "~> 1.0.1"
 gem "sprockets", "1.0.2"
+gem "modjs-architecture"
 
 group :test do
   gem "simplecov", "~> 0.5.4", :require => false

data/Gemfile.lock

@@ -2,6 +2,13 @@ GEM
   remote: http://rubygems.org/
   specs:
     ZenTest (4.6.2)
+    architecture-js (0.1.11)
+      fssm
+      fssm (~> 0.2.8.1)
+      jsmin
+      jsmin (~> 1.0.1)
+      sprockets (= 1.0.2)
+      sprockets (= 1.0.2)
     autotest-growl (0.2.16)
     diff-lcs (1.1.3)
     fssm (0.2.8.1)
@@ -13,6 +20,9 @@ GEM
       rdoc
     jsmin (1.0.1)
     json (1.6.5)
+    modjs-architecture (0.1.1)
+      architecture-js (~> 0.1.11)
+      architecture-js (~> 0.1.11)
     multi_json (1.0.4)
     rake (0.9.2.2)
     rdoc (3.12)
@@ -41,6 +51,7 @@ DEPENDENCIES
   fssm (~> 0.2.8.1)
   jeweler (~> 1.8.3)
   jsmin (~> 1.0.1)
+  modjs-architecture
   rspec (~> 2.8.0)
   simplecov (~> 0.5.4)
   sprockets (= 1.0.2)

data/VERSION

@@ -1 +1 @@
-0.1.11
+0.1.12

data/architecture-js.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "architecture-js"
-  s.version = "0.1.11"
+  s.version = "0.1.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dayton Nolan"]
-  s.date = "2012-02-04"
+  s.date = "2012-02-17"
   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"]
@@ -31,7 +31,6 @@ Gem::Specification.new do |s|
     "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",
     "lib/architecture-js/helpers.rb",
@@ -39,9 +38,8 @@ Gem::Specification.new do |s|
     "lib/architecture-js/project.rb",
     "repository/modjs/plugins/jquery-elements.js",
     "spec/.DS_Store",
+    "spec/architect_spec.rb",
     "spec/architecture-js_spec.rb",
-    "spec/cli_spec.rb",
-    "spec/command_spec.rb",
     "spec/fixtures/.DS_Store",
     "spec/fixtures/_hidden.js",
     "spec/fixtures/compiled_src.js",
@@ -57,6 +55,7 @@ Gem::Specification.new do |s|
     "spec/fixtures/src_file.js",
     "spec/fixtures/templates/test_template_one.js",
     "spec/fixtures/templates/test_template_two.js",
+    "spec/fixtures/test_framework.rb",
     "spec/fixtures/test_template_options.js",
     "spec/fixtures/test_template_two.js",
     "spec/fixtures/update.architecture",
@@ -81,6 +80,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<fssm>, ["~> 0.2.8.1"])
       s.add_runtime_dependency(%q<jsmin>, ["~> 1.0.1"])
       s.add_runtime_dependency(%q<sprockets>, ["= 1.0.2"])
+      s.add_runtime_dependency(%q<modjs-architecture>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
@@ -93,6 +93,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<fssm>, ["~> 0.2.8.1"])
       s.add_dependency(%q<jsmin>, ["~> 1.0.1"])
       s.add_dependency(%q<sprockets>, ["= 1.0.2"])
+      s.add_dependency(%q<modjs-architecture>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.8.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
@@ -106,6 +107,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<fssm>, ["~> 0.2.8.1"])
     s.add_dependency(%q<jsmin>, ["~> 1.0.1"])
     s.add_dependency(%q<sprockets>, ["= 1.0.2"])
+    s.add_dependency(%q<modjs-architecture>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.8.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.3"])

data/lib/architecture-js.rb

@@ -1,14 +1,23 @@
-require "#{File.dirname(__FILE__)}/architecture-js/helpers"
+module ArchitectureJS
+end
+
+require "architecture-js/helpers"
 
 module ArchitectureJS
-  BASE_DIR = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-  LIB_DIR = File.expand_path(File.join(File.dirname(__FILE__)))
-  ROOT_DIR = Dir.getwd
-  VERSION = File.read("#{BASE_DIR}/VERSION")
-  FRAMEWORKS = Hash.new
+  def base_directory
+    File.expand_path(File.join(File.dirname(__FILE__), '..'))
+  end
+
+  def lib_directory
+    File.expand_path(File.join(File.dirname(__FILE__)))
+  end
+
+  def root_directory
+    File.expand_path(File.join(File.dirname(Dir.getwd)))
+  end
 
   def register_framework(name, constructor)
-    FRAMEWORKS[name] = constructor
+    ArchitectureJS::FRAMEWORKS[name] = constructor
   end
 
   def create_project_from_config(project_dir = nil)
@@ -25,8 +34,17 @@ module ArchitectureJS
     project = ArchitectureJS::FRAMEWORKS[config[:framework]].new(config, project_dir)
   end
 
-  module_function :register_framework,
+  module_function :base_directory,
+                  :lib_directory,
+                  :register_framework,
                   :create_project_from_config
 end
 
-Dir.glob(File.dirname(__FILE__) + '/architecture-js/*') { |file| require file }
+module ArchitectureJS
+  VERSION = File.read("#{base_directory}/VERSION")
+  FRAMEWORKS = Hash.new
+end
+
+%w(dependencies generator notification project architect).each do |lib|
+  require "architecture-js/#{lib}"
+end

data/lib/architecture-js/architect.rb

@@ -1,3 +1,5 @@
+require 'optparse'
+
 module Architect
 
   class << self
@@ -12,96 +14,129 @@ module Architect
 
     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
+                :options
 
-    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
+    def initialize(path = nil)
+      if path
+        @root = File.expand_path(path)
       else
-        help
+        @root = File.expand_path(Dir.getwd)
       end
     end
 
-    def create
-      app_name = @args[0]
-      sub_dir = @args[1] || nil
+    def run
+      parse_options
+      self.send(@command)
+    end
 
-      if app_name.nil?
-        puts "Error! Application name is required (architect create app_name)"
-        exit
+    def create
+      app_name = @args.first
+      if @args[1]
+        sub_dir = @args[1] unless @args[1].match /^-/
       end
-    
-      config = { name: app_name }
-      config[:root] = sub_dir unless sub_dir.nil?
-      ArchitectureJS::Command.create(config)
+      framework = @options[:framework]
+
+      raise 'you must specify a project name: architect create [project_name]' if args[0].nil?
+
+      @root = File.expand_path sub_dir if sub_dir
+      config = { name: app_name, framework: framework }
+
+      require "#{framework}-architecture" unless framework == 'none'
+
+      project = ArchitectureJS::FRAMEWORKS[framework].new(config, @root)
+      project.create
     end
 
     def generate
       puts 'To be implemented'
+
+      #conf_path = "#{config[:project].root}/ninjs.conf"
+      #raise "ninjs.conf was not located in #{conf_path}" unless File.exists? conf_path
+      #generator = ArchitectureJS::Generator.new(config)
+      #generator.generate
     end
 
     def compile
-      if options[:c] || options[:compress]
-        ArchitectureJS::Command.compile({ force_compress: true })
-      else
-        ArchitectureJS::Command.compile
-      end
+      project = ArchitectureJS::create_project_from_config(File.expand_path(Dir.getwd))
+      project.config[:output] = 'compressed' if options[:c] || options[:compress]
+      project.update
     end
 
     def watch
-      ArchitectureJS::Command.watch
-    end
+      require "fssm"
+      path ||= Dir.getwd
+      path = File.expand_path(path)
+
+      puts ArchitectureJS::Notification.log "architect is watching for changes. Press Ctrl-C to stop."
+      project = ArchitectureJS::Project::new_from_config(path)
+      project.update
+      watch_hash = Hash.new
+      watch_files = Dir["#{path}/**/"]
+      watch_files.shift # remove the project root
+       remove the build_dir
+      watch_files.reject! { |dir| dir.match(/#{path}\/#{project.config[:build_dir]}/) }
+
+      watch_files.each do |dir|
+        watch_hash[dir] = "**/*.js"
+      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
+      watch_hash[path] = "**/*.architecture"
+      watch_hash["#{ArchitectureJS::base_directory}/repository"] = "**/*.js" # check changes to the repository as well
+
+      FSSM.monitor do
+        watch_hash.each do |dir, g|
+          path "#{dir}" do
+            glob g
+
+            update do |base, relative|
+              puts ArchitectureJS::Notification.event "change detected in #{relative}"
+              project.config.read if relative.match(/conf$/)
+              project.update
+            end
+
+            create do |base, relative|
+              puts ArchitectureJS::Notification.event "#{relative} created"
+              project.update
+            end
+
+            delete do |base, relative|
+              puts ArchitectureJS::Notification.event "#{relative} deleted"
+              project.update
+            end
           end
         end
       end
+    end
 
-      def parse_flag(arg)
-        key = arg.gsub(/^\-+/, '')
-        @options[key] = true
-        @options[key.to_sym] = true
-      end
+    private
+      def parse_options
+        @options = {}
+        OptionParser.new do |opts|
+          opts.banner = "Usage: example.rb [options]"
+
+          options[:version] = false
+          opts.on("-v", "--version", "Version info") do
+            @options[:version] = 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
+          options[:framework] = 'none'
+          opts.on('-f', '--framework FRAMEWORK', 'with framework') do |framework|
+            @options[:framework] = framework
+          end
+
+          @options[:compress] = false
+          opts.on('-c', '--compress', 'with compression') do
+            @options[:compress] = true
+          end
+
+          opts.on('-h', '--help', 'Display help') do
+            puts 'Show help'
+          end
+        end.parse!
 
-      def add_subcommand(arg, index)
-        #@subcommands[arg] = [sub args]
+        @command = ARGV[0].to_sym
+        @args = Array.try_convert(ARGV)
+        @args.shift # remove command
       end
 
       def help(command = nil)

data/lib/architecture-js/project.rb

@@ -1,4 +1,5 @@
 module ArchitectureJS
+
   class Project
     attr_accessor :root,
                   :src_files,
@@ -9,9 +10,6 @@ module ArchitectureJS
                   :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
 
@@ -30,7 +28,7 @@ module ArchitectureJS
       @config_file = "#{config[:name].downcase}.architecture"
       root ||= Dir.getwd
       @root = File.expand_path(root)
-      @template_directories = ["#{ArchitectureJS::BASE_DIR}/templates", "#{@root}/templates"]
+      @template_directories = ["#{ArchitectureJS::base_directory}/templates", "#{@root}/templates"]
       @directories = ['lib', 'src']
       @src_files = Array.new
       @config = {
@@ -123,7 +121,7 @@ module ArchitectureJS
 
     def compile_src_file(file_path, file_name)
       sprockets = Sprockets::Secretary.new(
-        root: ArchitectureJS::BASE_DIR,
+        root: ArchitectureJS::base_directory,
         asset_root: @config[:asset_root],
         load_path: ['repository'],
         source_files: [file_path]
@@ -154,4 +152,7 @@ module ArchitectureJS
     end
 
   end # class Project
-end # module ArchitectureJS
+end # module ArchitectureJS
+
+# this line adds the default framework to ArchitectureJS
+ArchitectureJS::register_framework('none', ArchitectureJS::Project)

data/spec/architect_spec.rb

@@ -0,0 +1,78 @@
+require 'spec_helper'
+
+describe 'architect' do
+
+  context "CLI" do
+    before :each do
+      @bin = "#{ArchitectureJS::base_directory}/bin/architect"
+      FileUtils.mkdir "#{TMP_DIR}" unless File.exists? "#{TMP_DIR}"
+      `cd #{TMP_DIR}; #{@bin} create myapp`
+      FileUtils.cp "#{FIXTURES}/lib1.js", "#{TMP_DIR}/src/lib1.js"
+      FileUtils.cp "#{FIXTURES}/lib2.js", "#{TMP_DIR}/src/lib2.js"
+      FileUtils.cp "#{FIXTURES}/src_file.js", "#{TMP_DIR}/src/myapp.js"
+    end
+
+  	after :each do
+      FileUtils.rm_rf "#{TMP_DIR}" if File.exists? "#{TMP_DIR}"
+    end
+
+    it 'should create a new application' do
+      "#{TMP_DIR}/myapp.architecture".should be_same_file_as "#{FIXTURES}/myapp.architecture"
+      File.directory?("#{TMP_DIR}/lib").should be_true
+      File.directory?("#{TMP_DIR}/src").should be_true
+    end
+
+    it 'should create a new application in a subdirectory' do
+      suppress_output { %x(cd #{TMP_DIR}; #{@bin} create myapp sub) }
+      "#{TMP_DIR}/sub/myapp.architecture".should be_same_file_as "#{FIXTURES}/myapp.architecture"
+      File.directory?("#{TMP_DIR}/sub/lib").should be_true
+      File.directory?("#{TMP_DIR}/sub/src").should be_true
+      File.exists?("#{TMP_DIR}/sub/src/myapp.js").should be_true
+      FileUtils.rm_rf "#{TMP_DIR}/sub"
+    end
+
+    it 'should compile the application' do
+      suppress_output { %x(cd #{TMP_DIR}; #{@bin} compile) }
+      File.exists?("#{TMP_DIR}/lib/myapp.js").should be_true
+      "#{TMP_DIR}/lib/myapp.js".should be_same_file_as "#{FIXTURES}/compressed.js"
+    end
+  end
+=begin
+  context 'alternate framework' do
+
+    before :each do
+      @bin = "#{ArchitectureJS::base_directory}/bin/architect"
+      FileUtils.mkdir TMP_DIR unless File.exists? TMP_DIR
+    end
+
+    after :each do
+      FileUtils.rm_rf TMP_DIR if File.exists? TMP_DIR
+    end
+
+    it 'should create a new application with an alternate framework' do
+      puts `cd #{TMP_DIR}; #{@bin} create myapp -f modjs`
+
+      File.directory?("#{TMP_DIR}/application").should be_true
+      File.directory?("#{TMP_DIR}/elements").should be_true
+      File.directory?("#{TMP_DIR}/lib").should be_true
+      File.directory?("#{TMP_DIR}/models").should be_true
+      File.directory?("#{TMP_DIR}/modules").should be_true
+      File.directory?("#{TMP_DIR}/plugins").should be_true
+      File.directory?("#{TMP_DIR}/spec").should be_true
+    end
+
+    it 'should create a new application in a subdirectory with an alternate framework' do
+      puts `cd #{TMP_DIR}; #{@bin} create myapp sub -f modjs`
+
+      File.directory?("#{TMP_DIR}/sub/application").should be_true
+      File.directory?("#{TMP_DIR}/sub/elements").should be_true
+      File.directory?("#{TMP_DIR}/sub/lib").should be_true
+      File.directory?("#{TMP_DIR}/sub/models").should be_true
+      File.directory?("#{TMP_DIR}/sub/modules").should be_true
+      File.directory?("#{TMP_DIR}/sub/plugins").should be_true
+      File.directory?("#{TMP_DIR}/sub/spec").should be_true
+    end
+
+  end
+=end
+end

data/spec/architecture-js_spec.rb

@@ -1,20 +1,20 @@
 require "spec_helper"
 
 describe ArchitectureJS do  
-  it 'should have a BASE_DIR constant' do
-    ArchitectureJS::BASE_DIR.should_not be_nil
+  it 'should have a base_directory constant' do
+    ArchitectureJS::base_directory.should_not be_nil
   end
   
-  it 'should have a LIB_DIR constant' do
-    ArchitectureJS::LIB_DIR.should_not be_nil
+  it 'should have a lib_directory constant' do
+    ArchitectureJS::lib_directory.should_not be_nil
   end
   
-  it 'should have a ROOT_DIR' do
-    ArchitectureJS::ROOT_DIR.should_not be_nil
+  it 'should have a lib_directory' do
+    ArchitectureJS::lib_directory.should_not be_nil
   end
   
   it 'should have the correct VERSION' do
-    version = File.open("#{ArchitectureJS::BASE_DIR}/VERSION").read
+    version = File.open("#{ArchitectureJS::base_directory}/VERSION").read
     ArchitectureJS::VERSION.should === version
   end
 

data/spec/fixtures/test_framework.rb

@@ -0,0 +1,21 @@
+module TestFramework
+  class Project < ArchitectureJS::Project
+
+    def initialize(config, root = nil)
+      @config = {
+        framework: 'test',
+        src_dir: 'modules',
+        build_dir: 'application',
+        dependencies: [],
+        autoload: []
+      }
+      @config.merge! config unless config.nil?
+
+      super(@config, root)
+      @directories = %w'application elements lib models modules plugins spec'
+    end
+  end
+end
+
+# this line adds the default framework to ArchitectureJS
+ArchitectureJS::register_framework('test', TestFramework::Project)

data/spec/project_spec.rb

@@ -39,7 +39,7 @@ describe ArchitectureJS::Project do
     end
 
     it "should have template_directories" do
-      @project.template_directories.should == ["#{ArchitectureJS::BASE_DIR}/templates", "#{TMP_DIR}/templates"]
+      @project.template_directories.should == ["#{ArchitectureJS::base_directory}/templates", "#{TMP_DIR}/templates"]
     end
 
     it "should have a generator" do

data/spec/spec_helper.rb

@@ -4,6 +4,7 @@ require 'architecture-js'
 require 'fileutils'
 require 'rspec'
 require 'digest/md5'
+require 'fixtures/test_framework.rb'
 
 RSpec.configure do |config|
   config.color_enabled = true
@@ -32,6 +33,6 @@ def suppress_output(&block)
   fake.string
 end
 
-SPEC_DIR = "#{ArchitectureJS::BASE_DIR}/spec"
+SPEC_DIR = "#{ArchitectureJS::base_directory}/spec"
 TMP_DIR = "#{SPEC_DIR}/tmp"
 FIXTURES = "#{SPEC_DIR}/fixtures"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: architecture-js
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-04 00:00:00.000000000Z
+date: 2012-02-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fssm
-  requirement: &70096504653840 !ruby/object:Gem::Requirement
+  requirement: &70245509245260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.2.8.1
   type: :runtime
   prerelease: false
-  version_requirements: *70096504653840
+  version_requirements: *70245509245260
 - !ruby/object:Gem::Dependency
   name: jsmin
-  requirement: &70096504653360 !ruby/object:Gem::Requirement
+  requirement: &70245509244780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *70096504653360
+  version_requirements: *70245509244780
 - !ruby/object:Gem::Dependency
   name: sprockets
-  requirement: &70096504652780 !ruby/object:Gem::Requirement
+  requirement: &70245509233900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,10 +43,21 @@ dependencies:
         version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70096504652780
+  version_requirements: *70245509233900
+- !ruby/object:Gem::Dependency
+  name: modjs-architecture
+  requirement: &70245509233300 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70245509233300
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70096504652120 !ruby/object:Gem::Requirement
+  requirement: &70245509232700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +65,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70096504652120
+  version_requirements: *70245509232700
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70096504651540 !ruby/object:Gem::Requirement
+  requirement: &70245509232100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +76,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70096504651540
+  version_requirements: *70245509232100
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70096504651000 !ruby/object:Gem::Requirement
+  requirement: &70245509231520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +87,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *70096504651000
+  version_requirements: *70245509231520
 - !ruby/object:Gem::Dependency
   name: ZenTest
-  requirement: &70096504642800 !ruby/object:Gem::Requirement
+  requirement: &70245509230980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +98,10 @@ dependencies:
         version: 4.6.2
   type: :development
   prerelease: false
-  version_requirements: *70096504642800
+  version_requirements: *70245509230980
 - !ruby/object:Gem::Dependency
   name: autotest-growl
-  requirement: &70096504642320 !ruby/object:Gem::Requirement
+  requirement: &70245509230400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +109,10 @@ dependencies:
         version: 0.2.16
   type: :development
   prerelease: false
-  version_requirements: *70096504642320
+  version_requirements: *70245509230400
 - !ruby/object:Gem::Dependency
   name: jsmin
-  requirement: &70096504641760 !ruby/object:Gem::Requirement
+  requirement: &70245509229780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70096504641760
+  version_requirements: *70245509229780
 - !ruby/object:Gem::Dependency
   name: fssm
-  requirement: &70096504641240 !ruby/object:Gem::Requirement
+  requirement: &70245509229300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +131,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70096504641240
+  version_requirements: *70245509229300
 - !ruby/object:Gem::Dependency
   name: sprockets
-  requirement: &70096504640760 !ruby/object:Gem::Requirement
+  requirement: &70245509228800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -131,7 +142,7 @@ dependencies:
         version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70096504640760
+  version_requirements: *70245509228800
 description: Architecture.js helps you generate scaffolding, manage third-party packages,
   compile, and compress your application.
 email: daytonn@gmail.com
@@ -155,7 +166,6 @@ files:
 - 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
 - lib/architecture-js/helpers.rb
@@ -163,9 +173,8 @@ files:
 - lib/architecture-js/project.rb
 - repository/modjs/plugins/jquery-elements.js
 - spec/.DS_Store
+- spec/architect_spec.rb
 - spec/architecture-js_spec.rb
-- spec/cli_spec.rb
-- spec/command_spec.rb
 - spec/fixtures/.DS_Store
 - spec/fixtures/_hidden.js
 - spec/fixtures/compiled_src.js
@@ -181,6 +190,7 @@ files:
 - spec/fixtures/src_file.js
 - spec/fixtures/templates/test_template_one.js
 - spec/fixtures/templates/test_template_two.js
+- spec/fixtures/test_framework.rb
 - spec/fixtures/test_template_options.js
 - spec/fixtures/test_template_two.js
 - spec/fixtures/update.architecture
@@ -206,7 +216,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 25093799947828401
+      hash: -4407288014740277425
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/architecture-js/command.rb

@@ -1,89 +0,0 @@
-module ArchitectureJS
-  module Command
-    def watch(path = nil)
-      require "fssm"
-      path ||= Dir.getwd
-      path = File.expand_path(path)
-
-      puts ArchitectureJS::Notification.log "ArchitectureJS are watching for changes. Press Ctrl-C to stop."
-      project = ArchitectureJS::Project::new_from_config(path)
-      project.update
-      watch_hash = Hash.new
-      watch_files = Dir["#{path}/**/"]
-      watch_files.shift # remove the project root
-      # remove the build_dir
-      watch_files.reject! { |dir| dir.match(/#{path}\/#{project.config[:build_dir]}/) }
-
-      watch_files.each do |dir|
-        watch_hash[dir] = "**/*.js"
-      end
-
-      watch_hash[path] = "**/*.architecture"
-      watch_hash["#{ArchitectureJS::BASE_DIR}/repository"] = "**/*.js" # check changes to the repository as well
-
-      FSSM.monitor do
-        watch_hash.each do |dir, g|
-          path "#{dir}" do
-            glob g
-
-            update do |base, relative|
-              puts ArchitectureJS::Notification.event "change detected in #{relative}"
-              project.config.read if relative.match(/conf$/)
-              project.update
-            end
-
-            create do |base, relative|
-              puts ArchitectureJS::Notification.event "#{relative} created"
-              project.update
-            end
-
-            delete do |base, relative|
-              puts ArchitectureJS::Notification.event "#{relative} deleted"
-              project.update
-            end
-          end
-        end
-      end
-    end # watch
-
-    def create(config = nil)
-      settings = {
-        name: nil,
-        root: File.expand_path(Dir.getwd)
-      }
-
-      settings.merge!(config) unless config.nil?
-
-      raise 'you must specify a project name: architect create ProjectName' if settings[:name].nil?
-
-      project = ArchitectureJS::Project.new({ name: settings[:name] }, settings[:root])# TODO add settings[:framework]
-      project.create
-    end
-
-    def compile(options = nil)
-      settings = {
-        force_compress: false,
-        path: File.expand_path(Dir.getwd)
-      }
-
-      settings.merge!(options) if options
-
-      project = ArchitectureJS::create_project_from_config(settings[:path])
-      project.config[:output] = 'compressed' if settings[:force_compress]
-      project.update
-    end
-
-    # TODO make generate generic to accept a type, look up in either local templates or master, and pass it options and flags parsed for use in erb files
-    def generate(config)
-      conf_path = "#{config[:project].root}/ninjs.conf"
-      raise "ninjs.conf was not located in #{conf_path}" unless File.exists? conf_path
-      generator = ArchitectureJS::Generator.new(config)
-      generator.generate
-    end
-
-    module_function :create,
-                    :watch,
-                    :compile,
-                    :generate
-  end
-end

data/spec/cli_spec.rb

@@ -1,42 +0,0 @@
-require 'spec_helper'
-# TODO write tests for CLI
-describe 'CLI' do
-  before :each do
-    @bin = "#{ArchitectureJS::BASE_DIR}/bin/architect"
-    FileUtils.mkdir "#{TMP_DIR}" unless File.exists? "#{TMP_DIR}"
-    suppress_output { %x(cd #{TMP_DIR}; #{@bin} create myapp) }
-    FileUtils.cp "#{FIXTURES}/lib1.js", "#{TMP_DIR}/src/lib1.js"
-    FileUtils.cp "#{FIXTURES}/lib2.js", "#{TMP_DIR}/src/lib2.js"
-    FileUtils.cp "#{FIXTURES}/src_file.js", "#{TMP_DIR}/src/myapp.js"
-  end
-
-	after :each do
-    FileUtils.rm_rf "#{TMP_DIR}" if File.exists? "#{TMP_DIR}"
-  end
-
-  it 'should create a new application' do
-    "#{TMP_DIR}/myapp.architecture".should be_same_file_as "#{FIXTURES}/myapp.architecture"
-    File.directory? "#{TMP_DIR}/lib"
-    File.directory? "#{TMP_DIR}/src"
-  end
-  
-  it 'should create a new application in a subdirectory' do
-    suppress_output { %x(cd #{TMP_DIR}; #{@bin} create myapp sub) }
-    "#{TMP_DIR}/sub/myapp.architecture".should be_same_file_as "#{FIXTURES}/myapp.architecture"
-    File.directory? "#{TMP_DIR}/sub/lib"
-    File.directory? "#{TMP_DIR}/sub/src"
-    File.exists? "#{TMP_DIR}/sub/myapp.js"
-    FileUtils.rm_rf "#{TMP_DIR}/sub"
-  end
-
-  it 'should compile the application' do
-    suppress_output { %x(cd #{TMP_DIR}; #{@bin} compile) }
-    File.exists?("#{TMP_DIR}/lib/myapp.js").should be_true
-    "#{TMP_DIR}/lib/myapp.js".should be_same_file_as "#{FIXTURES}/compressed.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/command_spec.rb

@@ -1,61 +0,0 @@
-require "spec_helper"
-
-describe ArchitectureJS::Command do  
-  
-  context 'API' do
-    before :each do
-      suppress_output do
-        @project = ArchitectureJS::Project.new({ name: 'myapp' }, TMP_DIR)
-        @project.create
-      end
-    end
-
-    after :each do
-      FileUtils.rm_rf TMP_DIR
-    end
-
-    it 'should have a watch command' do
-      ArchitectureJS::Command.should respond_to :watch
-    end
-
-    it 'should have a compile command' do
-      ArchitectureJS::Command.should respond_to :compile
-    end
-
-    it 'should have a generate command' do
-      ArchitectureJS::Command.should respond_to :generate
-    end
-
-    it 'should have a create command' do
-      ArchitectureJS::Command.should respond_to :create
-    end
-  end
-  
-  context 'Usage' do
-    before :each do
-      suppress_output { ArchitectureJS::Command.create({ name: 'myapp', root: TMP_DIR }) }
-    end
-
-    after :each do
-      FileUtils.rm_rf TMP_DIR
-    end
-
-    it 'should create a new application' do
-      "#{TMP_DIR}/myapp.architecture".should be_same_file_as "#{FIXTURES}/myapp.architecture"
-      File.directory?("#{TMP_DIR}/lib").should be_true
-      File.directory?("#{TMP_DIR}/src").should be_true
-    end
-
-    it 'should compile the application' do
-      FileUtils.cp "#{FIXTURES}/lib1.js", "#{TMP_DIR}/src/lib1.js"
-      FileUtils.cp "#{FIXTURES}/lib2.js", "#{TMP_DIR}/src/lib2.js"
-      FileUtils.cp "#{FIXTURES}/src_file.js", "#{TMP_DIR}/src/myapp.js"
-
-      suppress_output { ArchitectureJS::Command.compile({ path: TMP_DIR }) }
-
-      File.exists?("#{TMP_DIR}/lib/myapp.js").should be_true
-      "#{TMP_DIR}/lib/myapp.js".should be_same_file_as "#{FIXTURES}/compressed.js"
-    end
-
-  end # Usage
-end