architecture-js 0.5.3 → 0.5.4

data/HELP

@@ -1,29 +1,34 @@
 create    Creates a new architecture-js application in the
           current working directory or sub directory within.
 
+          examples:
+            architect create myapp
+            architect create myapp subdirectory
+            architect create myapp -b modjs
+
           Arguments:
             application name - Name of the architecture-js application
             subdirectory* - Directory where the application will be
-                          installed (created if nonexistent)
+                            installed (created if nonexistent)
 
-         Options:
+          Options:
             -b, --blueprint - Optional Blueprint framework to create
 
-          examples:
-            architect create myapp
-            architect create myapp subdirectory
-            architect create myapp -b modjs
-
 compile   Compiles the architecture-js project in the current working directory.
 
-            Options:
-                -c, --compress - Compress output with JsMin
+          example:
+            architect compile
 
-            example:
-                architect compile
+          Options:
+            -c, --compress - Compress output with JsMin
 
 generate  Generates scoffolding from a template.
 
+          examples:
+            architect generate mytemplate foo -f (boolean arguments use a single "-")
+            architect generate mytemplate foo --test "Hello" (named arguments can be boolean by passing no value `false`)
+            architect genreate mytemplate foo -f --test "Hello" (combined to generate complex templates)
+
           Arguments:
             name - Name of the template to generate
 
@@ -31,15 +36,10 @@ generate  Generates scoffolding from a template.
             *Options are arbitrary (optional) arguments specific to templates
             There are two types of options: boolean and named attributes
 
-          examples:
-            architect generate mytemplate foo -f (boolean arguments use a single "-")
-            architect generate mytemplate foo --test "Hello" (named arguments can be boolean by passing no value `false`)
-            architect genreate mytemplate foo -f --test "Hello" (combined to generate complex templates)
-
 watch     Watches the current working directory for file
           changes and compiles when changes are detected.
 
-            example:
-                architect watch
+          example:
+            architect watch
 
 * optional argument

data/VERSION

@@ -1 +1 @@
-0.5.3
+0.5.4

data/architecture-js.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "architecture-js"
-  s.version = "0.5.3"
+  s.version = "0.5.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dayton Nolan"]

data/lib/architecture-js/architect.rb

@@ -22,6 +22,7 @@ module Architect
       else
         @root = File.expand_path(Dir.getwd)
       end
+      @project = ArchitectureJS::Blueprint.new_from_config(@root)
     end
 
     def run
@@ -56,14 +57,11 @@ module Architect
 
       require "#{blueprint}-architecture" unless blueprint == 'default'
 
-      project = ArchitectureJS::BLUEPRINTS[blueprint].new(config, @root)
-      project.create
+      @project = ArchitectureJS::BLUEPRINTS[blueprint].new(config, @root)
+      @project.create
     end
 
     def generate
-      project_path = File.expand_path(Dir.getwd)
-      project = ArchitectureJS::Blueprint.new_from_config(project_path)
-
       config = {
         arguments: @args,
         template: @args.first,
@@ -71,36 +69,37 @@ module Architect
         options: @template_options
       }
       begin
-        project.generator.generate config
+        @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}" }
+        templates
       end
     end
 
     def compile
-      project = ArchitectureJS::Blueprint.new_from_config(File.expand_path(Dir.getwd))
-      project.config[:output] = 'compressed' if options[:c] || options[:compress]
-      project.update
+      @project.config[:output] = 'compressed' if options[:c] || options[:compress]
+      @project.update
     end
-    #compile
 
     def watch
-      path ||= Dir.getwd
-      path = File.expand_path(path)
-
-      project = ArchitectureJS::Blueprint::new_from_config(path)
-      project.update
-      watcher = project.watch
+      @project.update
+      @watcher = @project.watch
       puts ArchitectureJS::Notification.log "architect is watching for changes. Type 'quit' to stop."
-      start_interactive_session watcher
+      start_interactive_session
+    end
+
+    def templates
+      puts "Tempaltes:"
+      @project.generator.templates.each { |k,v| puts "  - #{k}" }
+    end
+
+    def src_files
+      puts "Source files:"
+      @project.src_files.each { |f| puts "  - #{File.basename f}" }
     end
-    #watch
 
     private
-      def start_interactive_session(watcher)
+      def start_interactive_session
         begin
           command = ''
           while not command =~ /^quit$/
@@ -108,17 +107,16 @@ module Architect
               command = gets.chomp
               case command
                 when /^quit$/
-                  watcher.stop
+                  @watcher.stop
                 when /src_files/
-                  puts watcher.project.src_files.join("\n")
+                  src_files
                 when /templates/
-                  watcher.project.generator.templates.each { |k,v| puts k }
+                  templates
                 when /compile/
                   begin
-                    watcher.project.update
+                    @project.update
                   rescue Exception => e
                     puts e.message
-                    ArchitectureJS::Notification.prompt
                   end
                 when /generate/
                   begin
@@ -130,8 +128,7 @@ module Architect
                   rescue Exception => e
                     puts e.message
                     puts "Available templates:"
-                    watcher.project.generator.templates.each { |k,v| puts "  - #{k}" }
-                    ArchitectureJS::Notification.prompt
+                    @project.generator.templates.each { |k,v| puts "  - #{k}" }
                   end
                 when /help/
                   puts 'Interactive commands:'
@@ -140,11 +137,14 @@ module Architect
                   puts '  templates - list available templates to generate'
                   puts '  src_files - list source files to be compiled into the build_dir'
                   puts '  help - show this menu'
+                  puts '  quit - stop watching for changes'
+                else
+                  puts ArchitectureJS::Notification.error "Unrecognized command `#{command}`. Try `help` or `quit`."
               end
           end
         rescue SystemExit, Interrupt
           puts
-          watcher.stop
+          @watcher.stop
         end
       end
 

data/lib/architecture-js/blueprint.rb

@@ -31,7 +31,6 @@ module ArchitectureJS
       @root = File.expand_path(root)
       @template_directories = ["#{ArchitectureJS::base_directory}/templates", "#{@root}/templates"]
       @directories = ['lib', 'src']
-      @src_files = []
       @config = {
         blueprint: 'default',
         src_dir: 'src',
@@ -40,6 +39,7 @@ module ArchitectureJS
         output: 'compressed'
       }
       @config.merge! config unless config.nil?
+      get_src_files
       @generator = ArchitectureJS::Generator.new self
     end
 

data/lib/architecture-js/generator.rb

@@ -40,9 +40,10 @@ module ArchitectureJS
     end
 
     def generate(config)
-      template = config[:template]
-      raise "There is no template named #{template} in the #{@blueprint[:name]} project" if @templates[template].nil?
+      raise "You must provide a template to generate:\n  - architect generate <template>" unless config[:template]
+      raise "There is no template named '#{template}' in the #{@blueprint[:name]} project" unless @templates[config[:template]]
 
+      template = config[:template]
       options = config[:options]
       arguments = config[:arguments]
       filename = "#{config[:filename]}#{@templates[template][:ext]}"

data/lib/architecture-js/watcher.rb

@@ -9,9 +9,9 @@ module ArchitectureJS
       @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
+                 update_files(modified, "modified") if modified.length > 0 
+                 update_files(added, "added") if added.length > 0
+                 update_files(removed, "deleted") if removed.length > 0
                end
     end
 
@@ -26,11 +26,15 @@ module ArchitectureJS
 
     private
 
-      def update_files(files, message)
+      def update_files(files, action)
         files.each do |f|
           f = File.basename f
+          if action == "deleted"
+            FileUtils.rm_rf("#{@project.root}/#{f}")
+            puts "remove #{@project.root}/#{f}"
+          end
 
-          puts "\n" << ArchitectureJS::Notification.event("#{f} #{message}")
+          puts "\n" << ArchitectureJS::Notification.event("#{f} was #{action}")
         end
 
         @project.read_config

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: architecture-js
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
   prerelease: 
 platform: ruby
 authors:
@@ -242,7 +242,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2753947263902784198
+      hash: -1429009403293119997
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: