architecture-js 0.4.0 → 0.5.0

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.5.0

data/architecture-js.gemspec

@@ -0,0 +1,152 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = "architecture-js"
+  s.version = "0.5.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Dayton Nolan"]
+  s.date = "2012-05-27"
+  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"]
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.md"
+  ]
+  s.files = [
+    ".DS_Store",
+    ".document",
+    ".rvmrc",
+    ".travis.yml",
+    "AUTHORS",
+    "Gemfile",
+    "Gemfile.lock",
+    "HELP",
+    "LICENSE.txt",
+    "README.md",
+    "Rakefile",
+    "VERSION",
+    "architecture-js.gemspec",
+    "bin/architect",
+    "docs/docco.css",
+    "lib/architecture-js.rb",
+    "lib/architecture-js/architect.rb",
+    "lib/architecture-js/blueprint.rb",
+    "lib/architecture-js/dependencies.rb",
+    "lib/architecture-js/generator.rb",
+    "lib/architecture-js/helpers.rb",
+    "lib/architecture-js/notification.rb",
+    "lib/architecture-js/watcher.rb",
+    "lib/sprockets/CHANGELOG",
+    "lib/sprockets/LICENSE",
+    "lib/sprockets/README.markdown",
+    "lib/sprockets/lib/sprockets.rb",
+    "lib/sprockets/lib/sprockets/concatenation.rb",
+    "lib/sprockets/lib/sprockets/environment.rb",
+    "lib/sprockets/lib/sprockets/error.rb",
+    "lib/sprockets/lib/sprockets/pathname.rb",
+    "lib/sprockets/lib/sprockets/preprocessor.rb",
+    "lib/sprockets/lib/sprockets/secretary.rb",
+    "lib/sprockets/lib/sprockets/source_file.rb",
+    "lib/sprockets/lib/sprockets/source_line.rb",
+    "lib/sprockets/lib/sprockets/version.rb",
+    "lib/sprockets/test/fixtures/assets/images/script_with_assets/one.png",
+    "lib/sprockets/test/fixtures/assets/images/script_with_assets/two.png",
+    "lib/sprockets/test/fixtures/assets/stylesheets/script_with_assets.css",
+    "lib/sprockets/test/fixtures/constants.yml",
+    "lib/sprockets/test/fixtures/double_slash_comments_that_are_not_requires_should_be_ignored_when_strip_comments_is_false.js",
+    "lib/sprockets/test/fixtures/double_slash_comments_that_are_not_requires_should_be_removed_by_default.js",
+    "lib/sprockets/test/fixtures/multiline_comments_should_be_removed_by_default.js",
+    "lib/sprockets/test/fixtures/requiring_a_file_after_it_has_already_been_required_should_do_nothing.js",
+    "lib/sprockets/test/fixtures/requiring_a_file_that_does_not_exist_should_raise_an_error.js",
+    "lib/sprockets/test/fixtures/requiring_a_single_file_should_replace_the_require_comment_with_the_file_contents.js",
+    "lib/sprockets/test/fixtures/requiring_the_current_file_should_do_nothing.js",
+    "lib/sprockets/test/fixtures/src/constants.yml",
+    "lib/sprockets/test/fixtures/src/foo.js",
+    "lib/sprockets/test/fixtures/src/foo/bar.js",
+    "lib/sprockets/test/fixtures/src/foo/foo.js",
+    "lib/sprockets/test/fixtures/src/script_with_assets.js",
+    "lib/sprockets/test/fixtures/src/script_with_comments.js",
+    "lib/sprockets/test/test_concatenation.rb",
+    "lib/sprockets/test/test_environment.rb",
+    "lib/sprockets/test/test_helper.rb",
+    "lib/sprockets/test/test_pathname.rb",
+    "lib/sprockets/test/test_preprocessor.rb",
+    "lib/sprockets/test/test_secretary.rb",
+    "lib/sprockets/test/test_source_file.rb",
+    "lib/sprockets/test/test_source_line.rb",
+    "repository/modjs/plugins/jquery-elements.js",
+    "spec/.DS_Store",
+    "spec/architect_spec.rb",
+    "spec/architecture-js_spec.rb",
+    "spec/blueprint_spec.rb",
+    "spec/fixtures/.DS_Store",
+    "spec/fixtures/_hidden.js",
+    "spec/fixtures/compiled_src.js",
+    "spec/fixtures/compressed.blueprint",
+    "spec/fixtures/compressed.js",
+    "spec/fixtures/ejs.ejs",
+    "spec/fixtures/env-test.js",
+    "spec/fixtures/existing.blueprint",
+    "spec/fixtures/lib1.js",
+    "spec/fixtures/lib1_compressed.js",
+    "spec/fixtures/lib2.js",
+    "spec/fixtures/lib2_compressed.js",
+    "spec/fixtures/myapp.blueprint",
+    "spec/fixtures/src_file.js",
+    "spec/fixtures/templates/env_template.js",
+    "spec/fixtures/templates/test_template_one.js",
+    "spec/fixtures/templates/test_template_two.js",
+    "spec/fixtures/test_blueprint.rb",
+    "spec/fixtures/test_template_options.js",
+    "spec/fixtures/test_template_two.js",
+    "spec/fixtures/underscore_template.js",
+    "spec/fixtures/update.blueprint",
+    "spec/fixtures/update.js",
+    "spec/generator_spec.rb",
+    "spec/helpers_spec.rb",
+    "spec/notification_spec.rb",
+    "spec/spec_helper.rb",
+    "templates/blank.js"
+  ]
+  s.homepage = "https://github.com/daytonn/architecture-js"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.21"
+  s.summary = "architecture.js is a command line application to dynamically build and manage complex javascript applications."
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<listen>, [">= 0"])
+      s.add_runtime_dependency(%q<jsmin>, ["~> 1.0.1"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
+      s.add_development_dependency(%q<bundler>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
+      s.add_runtime_dependency(%q<jsmin>, [">= 0"])
+      s.add_runtime_dependency(%q<listen>, [">= 0"])
+    else
+      s.add_dependency(%q<listen>, [">= 0"])
+      s.add_dependency(%q<jsmin>, ["~> 1.0.1"])
+      s.add_dependency(%q<rspec>, ["~> 2.8.0"])
+      s.add_dependency(%q<bundler>, [">= 0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
+      s.add_dependency(%q<jsmin>, [">= 0"])
+      s.add_dependency(%q<listen>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<listen>, [">= 0"])
+    s.add_dependency(%q<jsmin>, ["~> 1.0.1"])
+    s.add_dependency(%q<rspec>, ["~> 2.8.0"])
+    s.add_dependency(%q<bundler>, [">= 0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
+    s.add_dependency(%q<jsmin>, [">= 0"])
+    s.add_dependency(%q<listen>, [">= 0"])
+  end
+end
+

data/lib/architecture-js/architect.rb

@@ -36,6 +36,8 @@ module Architect
 
       if @command
           self.send @command unless @command =~ /^-/
+      else
+        help
       end
 
     end
@@ -60,23 +62,6 @@ module Architect
 
     def generate
       project_path = File.expand_path(Dir.getwd)
-
-      # Go up to 10 levels up to look for the project config file
-      # This is not optimal but is probably the easiest way to allow
-      # generating templates in project sub-folders given we need to
-      # read the blueprint file to get the templates
-      10.times do
-        config_file = ArchitectureJS::get_config_file(project_path)
-
-        unless config_file
-          path_array = project_path.split(File::SEPARATOR)
-          path_array.pop # push the last dir off the stack
-          project_path = path_array.join(File::SEPARATOR)
-        else
-          break
-        end
-      end
-
       project = ArchitectureJS::Blueprint.new_from_config(project_path)
 
       config = {
@@ -85,8 +70,14 @@ module Architect
         filename: @args[1],
         options: @template_options
       }
-
-      project.generator.generate config
+      begin
+        project.generator.generate config
+      rescue Exception => e
+        puts e.message
+        puts "Be sure you ran the command correctly (architect generate <template> <filename> [options])"
+        puts "Available templates:"
+        project.generator.templates.each { |k,v| puts "  - #{k}" }
+      end
     end
 
     def compile
@@ -100,38 +91,43 @@ module Architect
       path ||= Dir.getwd
       path = File.expand_path(path)
 
-      puts ArchitectureJS::Notification.log "architect is watching for changes. Press Ctrl-C to stop."
       project = ArchitectureJS::Blueprint::new_from_config(path)
       project.update
-      
-      Listen.to(path, :filter => /\.jst?$/, :ignore => /#{project.config[:build_dir]}|spec|test/) do |modified, added, removed|
-        if modified.length > 0
-
-          modified.each do |f|
-            file = File.basename(f)
-            puts ArchitectureJS::Notification.event "change detected in #{file}"
-            project.config.read if f.match(/blueprint$/)
-          end
-
-          project.update
-        end
-
-        if added.length > 0
-          added.each do |f|
-            file = File.basename(f)
-            puts ArchitectureJS::Notification.event "#{file} created"
+      listener = project.watch
+
+      command = 'start'
+      puts ArchitectureJS::Notification.log "architect is watching for changes. Type 'quit' or 'exit' to stop."
+      while not command =~ /exit|quit/
+          print ArchitectureJS::Notification.prompt
+          command = gets.chomp
+          case command
+            when /exit|quit/
+              listener.stop
+            when /src_files/
+              puts project.src_files.join("\n")
+            when /templates/
+              project.generator.templates.each { |k,v| puts k }
+            when /compile|update/
+              begin
+                project.update
+              rescue Exception => e
+                puts e.message
+                ArchitectureJS::Notification.prompt
+              end
+            when /generate/
+              begin
+                args = command.split(/\s/)
+                parse_command args
+                parse_arguments args
+                parse_generate_options
+                self.send @command
+              rescue Exception => e
+                puts e.message
+                puts "Available templates:"
+                project.generator.templates.each { |k,v| puts "  - #{k}" }
+                ArchitectureJS::Notification.prompt
+              end
           end
-
-          project.update
-        end
-
-        if removed.length > 0
-          removed.each do |f|
-            file = File.basename(f)
-            puts ArchitectureJS::Notification.event "#{file} deleted"
-          end
-        end
-
       end
 
     end
@@ -190,15 +186,13 @@ module Architect
         # each_with_index
       end
 
-      def parse_arguments
-        @args = Array.try_convert(ARGV)
+      def parse_arguments(args = Array.try_convert(ARGV))
+        @args = args
         @args.shift # remove command
       end
 
-      def parse_command
-        unless ARGV[0].nil? && ARGV[0] =~ /^-/
-          @command = ARGV[0].to_sym 
-        end
+      def parse_command(args = ARGV)
+        @command = args[0].to_sym if args[0].respond_to? :to_sym
       end
 
       def help

data/lib/architecture-js/blueprint.rb

@@ -31,7 +31,7 @@ module ArchitectureJS
       @root = File.expand_path(root)
       @template_directories = ["#{ArchitectureJS::base_directory}/templates", "#{@root}/templates"]
       @directories = ['lib', 'src']
-      @src_files = Array.new
+      @src_files = []
       @config = {
         blueprint: 'default',
         src_dir: 'src',
@@ -100,7 +100,8 @@ module ArchitectureJS
       @errors = false
     end
 
-    def get_src_files      
+    def get_src_files
+      @src_files = []
       [*@config[:src_dir]].each do |directory| 
         add_src_files_to_project File.expand_path(directory, @root)
       end      
@@ -159,6 +160,11 @@ module ArchitectureJS
       end
     end
 
+    def watch
+      watcher = ArchitectureJS::Watcher.new self
+      watcher.watch
+    end
+
   end # class Blueprint
 end # module ArchitectureJS
 

data/lib/architecture-js/generator.rb

@@ -53,7 +53,7 @@ module ArchitectureJS
     def generate_file(filename, template, path = nil)
       path ||= File.expand_path(Dir.getwd)
       File.open("#{path}/#{filename}", "w+") { |f| f.write template }
-      puts ArchitectureJS::Notification.added "#{filename} added" if File.exists?("#{path}/#{filename}")
+      puts ArchitectureJS::Notification.added "#{filename} generated" if File.exists?("#{path}/#{filename}")
     end
 
     def render_template(template, filename, arguments, options)

data/lib/architecture-js/notification.rb

@@ -14,15 +14,16 @@ module ArchitectureJS
       log: "\e[32m>>>\e[0m ",
       event: "\e[33m<<<\e[0m ",
       added: "\e[32m+++\e[0m ",
-      error: "\e[0;31m!!!\e[0m "
+      error: "\e[0;31m!!!\e[0m ",
+      prompt: ">>> "
     }
 
     @@indicators.merge!({
       none: "",
-      log: ">>>",
-      event: "<<<",
-      added: "+++",
-      error: "!!!"
+      log: ">>> ",
+      event: "<<< ",
+      added: "+++ ",
+      error: "!!! ",
     }) if win_platform
 
     def self.notify(type, message)
@@ -49,6 +50,9 @@ module ArchitectureJS
     def self.error(message)
       self.notify :error, message
     end
-    
+
+    def self.prompt
+      self.notify :prompt, ''
+    end
   end
 end

data/lib/architecture-js/watcher.rb

@@ -0,0 +1,36 @@
+module ArchitectureJS
+  class Watcher
+
+    def initialize(project)
+      @project = project
+      @listener = Listen.to(@project.root)
+      @listener.ignore(/#{@project.config[:build_dir]}|spec|test/)
+               .filter(/\.jst?$/)
+               .change do |modified, added, removed|
+                 update_files(modified, "was modified") if modified.length > 0 
+                 update_files(added, "was added") if added.length > 0
+                 update_files(removed, "was deleted") if removed.length > 0
+               end
+    end
+
+    def watch
+      @listener.start(false)
+      @listener
+    end
+
+    private
+
+      def update_files(files, message)
+        files.each do |f|
+          f = File.basename f
+
+          puts "\n" << ArchitectureJS::Notification.event("#{f} #{message}")
+        end
+
+        @project.read_config
+        @project.update
+        print ArchitectureJS::Notification.prompt
+      end
+
+  end
+end

data/lib/architecture-js.rb

@@ -37,6 +37,6 @@ end
 
 require "sprockets/lib/sprockets"
 
-%w(dependencies generator notification blueprint architect).each do |lib|
+%w(dependencies generator notification watcher blueprint architect).each do |lib|
   require "architecture-js/#{lib}"
 end

data/spec/architect_spec.rb

@@ -38,14 +38,14 @@ describe 'architect' do
     end
 
     it 'should generate a template' do
-      `cd #{TMP_DIR}/src; #{@bin} generate blank test`
+      `cd #{TMP_DIR}; #{@bin} generate blank src/test`
       File.exists?("#{TMP_DIR}/src/test.js").should be_true
     end
 
     it 'should generate a template with options' do
       FileUtils.mkdir("#{TMP_DIR}/templates")
       FileUtils.cp("#{FIXTURES}/templates/test_template_two.js", "#{TMP_DIR}/templates/test_template.js")
-      `cd #{TMP_DIR}/src; #{@bin} generate test_template foo --optional_variable true --is_good -g --bool`
+      `cd #{TMP_DIR}; #{@bin} generate test_template src/foo --optional_variable true --is_good -g --bool`
       
       File.exists?("#{TMP_DIR}/src/foo.js").should be_true
       "#{TMP_DIR}/src/foo.js".should be_same_file_as "#{FIXTURES}/test_template_options.js"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: architecture-js
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-26 00:00:00.000000000 Z
+date: 2012-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: listen
@@ -145,6 +145,7 @@ files:
 - README.md
 - Rakefile
 - VERSION
+- architecture-js.gemspec
 - bin/architect
 - docs/docco.css
 - lib/architecture-js.rb
@@ -154,6 +155,7 @@ files:
 - lib/architecture-js/generator.rb
 - lib/architecture-js/helpers.rb
 - lib/architecture-js/notification.rb
+- lib/architecture-js/watcher.rb
 - lib/sprockets/CHANGELOG
 - lib/sprockets/LICENSE
 - lib/sprockets/README.markdown
@@ -240,7 +242,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2544092032087362210
+      hash: 514518267810295909
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: