architecture-js 0.5.5 → 0.5.6

data/VERSION

@@ -1 +1 @@
-0.5.5
+0.5.6

data/architecture-js.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "architecture-js"
-  s.version = "0.5.5"
+  s.version = "0.5.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dayton Nolan"]
@@ -33,6 +33,7 @@ Gem::Specification.new do |s|
     "architecture-js.gemspec",
     "bin/architect",
     "docs/docco.css",
+    "lib/.DS_Store",
     "lib/architecture-js.rb",
     "lib/architecture-js/architect.rb",
     "lib/architecture-js/blueprint.rb",

data/lib/architecture-js/architect.rb

@@ -71,15 +71,19 @@ module Architect
       begin
         @project.generator.generate config
       rescue Exception => e
-        puts e.message
+        puts ArchitectureJS::Notification.error e.message
         templates
       end
     end
 
     def compile
-      @project = ArchitectureJS::Blueprint.new_from_config(@root)
-      @project.config[:output] = 'compressed' if options[:c] || options[:compress]
-      @project.update
+      begin
+        @project = ArchitectureJS::Blueprint.new_from_config(@root)
+        compress = @options[:c] || @options[:compress]
+        @project.update(compress)
+      rescue Exception => e
+        puts ArchitectureJS::Notification.error e.message
+      end
     end
 
     def watch
@@ -92,7 +96,7 @@ module Architect
 
     def templates
       @project = ArchitectureJS::Blueprint.new_from_config(@root)
-      puts "Tempaltes:"
+      puts "Templates:"
       @project.generator.templates.each { |k,v| puts "  - #{k}" }
     end
 
@@ -109,40 +113,32 @@ module Architect
           while not command =~ /^quit$/
               print ArchitectureJS::Notification.prompt
               command = gets.chomp
-              case command
-                when /^quit$/
-                  @watcher.stop
-                when /src_files/
-                  src_files
-                when /templates/
-                  templates
-                when /compile/
-                  begin
-                    @project.update
-                  rescue Exception => e
-                    puts e.message
-                  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}" }
-                  end
-                when /help/
-                  puts 'Interactive commands:'
-                  puts '  compile - compile the application'
-                  puts '  generate - generate a template'
-                  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'
+              args = command.split(/\s/)
+              parse_command args
+              case @command
+              when /^quit$/
+                @watcher.stop
+              when /help/
+                puts 'Interactive commands:'
+                puts '  compile - compile the application'
+                puts '  generate - generate a template'
+                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'
+              when /compile|generate|templates|src_files/
+
+                if @command == :generate
+                  parse_arguments args
+                  parse_generate_options args
                 else
+                  args = args.drop 1
+                  parse_interactive_options(args)
+                  parse_arguments args
+                end
+
+                self.send @command
+              else
                   puts ArchitectureJS::Notification.error "Unrecognized command `#{command}`. Try `help` or `quit`."
               end
           end
@@ -152,6 +148,18 @@ module Architect
         end
       end
 
+      def parse_interactive_options(args = [])
+        @options = {}
+        
+        args.each do |option|
+          case option
+          when /\-c|\-\-compress/
+            @options[:compress] = true
+            @options[:c] = true
+          end
+        end
+      end
+
       def parse_options
         @options = {}
         OptionParser.new do |opts|

data/lib/architecture-js/blueprint.rb

@@ -91,11 +91,11 @@ module ArchitectureJS
       puts ArchitectureJS::Notification.added "#{@config[:src_dir]}/#{@config[:name]}.js created"
     end
 
-    def update
+    def update(compress = false)
       read_config
       get_src_files
       compile_src_files
-      compress_application if @config[:output] == 'compressed'
+      compress_application if compress || @config[:output] == 'compressed'
       puts ArchitectureJS::Notification.log "application updated" unless @errors
       @errors = false
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: architecture-js
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
   prerelease: 
 platform: ruby
 authors:
@@ -148,6 +148,7 @@ files:
 - architecture-js.gemspec
 - bin/architect
 - docs/docco.css
+- lib/.DS_Store
 - lib/architecture-js.rb
 - lib/architecture-js/architect.rb
 - lib/architecture-js/blueprint.rb
@@ -242,7 +243,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2644890009641043081
+      hash: -4246046546828477172
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: