spader 0.0.1.pre.pre → 0.0.3.pre.pre

data/lib/spader/command.rb

@@ -1,15 +1,14 @@
-#require "spader/commands/build"
-#require "spader/commands/download"
-
-module Spader
-  class Command
-    class InvalidParametersError < StandardError; end;
-      
-    def execute()
-      puts "RUNNING #{self.class}"
-    end
-  end
-  
-  require "spader/commands/generate"
-  require "spader/commands/build"
+# encoding: UTF-8
+
+module Spader
+  class Command
+    class InvalidParametersError < StandardError; end;
+      
+    def execute()
+      puts "RUNNING #{self.class}"
+    end
+  end
+  
+  require "spader/commands/generate"
+  require "spader/commands/build"
 end

data/lib/spader/commands/build.rb

@@ -1,121 +1,157 @@
-module Spader
-  class BuildCommand < Command
-    attr_accessor :zip, :path, :browsers, :browser, :environment, :version, :build_info
-    
-    def initialize()
-      @path = nil
-      @zip = false
-      @environment = "development"
-      @version = "0.0.0"
-      @browsers = BROWSERS
-      @browser = nil
-      @build_info = nil
-    end
-    
-    def execute()
-      super
-      puts "Building #{@path} @ v#{@version}/#{@environment} for #{@browsers.length} browser(s)."
-      
-      if @path.nil?() || @path.empty?()
-        puts "Path is required."
-        raise InvalidParametersError
-      end
-      
-      scss_dir = @path + "scss/"
-      font_dir = @path + "font/"
-      html_dir = @path + "html/"
-      icon_dir = @path + "icon/"
-      java_dir = @path + "js/"
-      mani_dir = @path + "manifest/"
-      msgs_dir = @path + "_locales/"
-      
-      SassC.load_paths << scss_dir
-        
-      dirs_in_dir(scss_dir).each do |dir|
-        SassC.load_paths << dir
-      end
-      
-      @build_info = DateTime.now().strftime("%Y-%m-%d @ %H:%M:%S")
-      
-      @browsers.each do |browser|
-        @browser = browser
-        dest_dir = @path + "dist/#{@environment}/#{browser}/"
-        
-        if environment == "production"
-          dest_dir << "#{@version}/"
-        end
-        
-        puts "Output dir: #{dest_dir}"
-        
-        if Dir.exists?(dest_dir)
-          FileUtils.remove_dir(dest_dir)
-        end
-        
-        FileUtils.mkdir_p(dest_dir)
-        
-        # manifest
-        in_manifest = mani_dir + "#{browser}.json"
-        out_manifest = dest_dir + "manifest.json"
-        FileUtils.cp(in_manifest, out_manifest)
-        
-        # messages
-        FileUtils.cp_r(msgs_dir, dest_dir + "_locales")
-        
-        scss_files = primary_files_in_dir(scss_dir)
-        
-        scss_files.each do |scss_file|
-          puts scss_file
-          in_filename = File.basename(scss_file)
-          out_file = dest_dir + in_filename.gsub(".erb", "").gsub(".css", "").gsub(".scss", "")
-          out_file << ".css"
-          scss_data = nil
-          
-          if in_filename.include?(".erb")
-            scss_data = render(scss_file)
-          else
-            scss_data = read_file(scss_file) 
-          end
-          
-          scss_data = SassC::Engine.new(scss_data, :style => :expanded).render()
-          write_file(out_file, scss_data)
-        end
-        
-        js_files = primary_files_in_dir(java_dir)
-        
-        js_files.each do |js_file|
-          puts js_file
-          in_filename = File.basename(js_file)
-          out_file = dest_dir + in_filename.gsub(".erb", "").gsub(".js", "")
-          out_file << ".js"
-          js_data = nil
-          
-          if in_filename.include?(".erb")
-            js_data = render(js_file)
-          else
-            js_data = read_file(js_file)
-          end
-          
-          write_file(out_file, js_data)
-        end
-        
-        html_files = primary_files_in_dir(html_dir)
-        
-        html_files.each do |html_file|
-          puts html_file
-          in_filename = File.basename(html_file)
-          out_file = dest_dir + in_filename.gsub(".erb", "").gsub(".html", "")
-          out_file << ".html"
-          html_data = nil
-          
-          if in_filename.include?(".erb")
-            html_data = render(html_file)
-          else
-            html_data = read_file(html_data)
-          end
-          
-          write_file(out_file, html_data)
-        end
-      end
-    end
-  end
+# encoding: UTF-8
+
+module Spader
+  class BuildCommand < Command
+    attr_accessor :zip, :path, :browsers, :browser, :environment, :version, :build_info
+    
+    def initialize()
+      @path = nil
+      @zip = false
+      @environment = "development"
+      @version = "0.0.0"
+      @browsers = BROWSERS
+      @browser = nil
+      @build_info = nil
+    end
+    
+    def execute()
+      super
+      puts "Building #{@path} @ v#{@version}/#{@environment} for #{@browsers.length} browser(s)."
+      
+      if @path.nil?() || @path.empty?()
+        puts "Path is required."
+        raise InvalidParametersError
+      end
+      
+      project = Project.new().load_json(@path + "spader.json")
+      dist_dir = @path + "dist/"
+      scss_dir = @path + "scss/"
+      font_dir = @path + "font/"
+      html_dir = @path + "html/"
+      icon_dir = @path + "icon/"
+      java_dir = @path + "js/"
+      mani_dir = @path + "manifest/"
+      msgs_dir = @path + "_locales/"
+      
+      SassC.load_paths << scss_dir
+        
+      dirs_in_dir(scss_dir).each do |dir|
+        SassC.load_paths << dir
+      end
+      
+      @build_info = DateTime.now().strftime("%Y-%m-%d @ %H:%M:%S")
+      
+      @browsers.each do |browser|
+        @browser = browser
+        dest_dir = dist_dir + "#{@environment}/#{browser}/"
+        
+        if environment == "production"
+          dest_dir << "#{@version}/"
+        end
+        
+        puts "Output dir: #{dest_dir}"
+        
+        if Dir.exists?(dest_dir)
+          FileUtils.remove_dir(dest_dir)
+        end
+        
+        FileUtils.mkdir_p(dest_dir)
+        
+        # manifest -- should use our Manifest class
+        in_manifest = mani_dir + "manifest.json.erb"
+        out_manifest = dest_dir + "manifest.json"
+        manifest_data = render(in_manifest)
+        manifest_data = JSON.parse(manifest_data)
+        manifest_data["version"] = @version
+        
+        if !project.permissions.empty?()
+          manifest_data["permissions"] += project.permissions
+          
+          if project.permissions.include?("activeTab") && !is_browser_chromal?()
+            manifest_data["permissions"] << "tabs"
+          end
+        end
+        
+        manifest_data["permissions"].uniq!()
+        write_file(out_manifest, JSON.pretty_generate(manifest_data))
+        
+        # messages
+        FileUtils.cp_r(msgs_dir, dest_dir + "_locales")
+        
+        scss_files = primary_files_in_dir(scss_dir) + project.scss
+        
+        scss_files.each do |scss_file|
+          in_filename = File.basename(scss_file)
+          out_file = dest_dir + in_filename.gsub(".erb", "").gsub(".css", "").gsub(".scss", "")
+          out_file << ".css"
+          scss_data = nil
+          
+          if in_filename.include?(".erb")
+            scss_data = render(scss_file)
+          else
+            scss_data = read_file(scss_file) 
+          end
+          
+          scss_data = SassC::Engine.new(scss_data, :style => :expanded).render()
+          write_file(out_file, scss_data)
+        end
+        
+        js_files = primary_files_in_dir(java_dir) + project.js
+        
+        js_files.each do |js_file|
+          in_filename = File.basename(js_file)
+          out_file = dest_dir + in_filename.gsub(".erb", "").gsub(".js", "")
+          out_file << ".js"
+          js_data = nil
+          
+          if in_filename.include?(".erb")
+            js_data = render(js_file)
+          else
+            js_data = read_file(js_file)
+          end
+          
+          write_file(out_file, js_data)
+        end
+        
+        html_files = primary_files_in_dir(html_dir) + project.html
+        
+        html_files.each do |html_file|
+          in_filename = File.basename(html_file)
+          out_file = dest_dir + in_filename.gsub(".erb", "").gsub(".html", "")
+          out_file << ".html"
+          html_data = nil
+          
+          if in_filename.include?(".erb")
+            html_data = render(html_file)
+          else
+            html_data = read_file(html_data)
+          end
+          
+          write_file(out_file, html_data)
+        end
+        
+        static_files = project.static
+        
+        static_files.each do |static_file|
+          in_filename = File.basename(static_file)
+          out_file = dest_dir + in_filename
+          FileUtils.cp(static_file, out_file)
+        end
+        
+        if @zip
+          zip_file = dist_dir + "3camelizer-#{browser}-#{@environment}-#{@version}.zip"
+          
+          # this should probably prompt the user for confirmation
+          # or do something more helpful
+          if File.exists?(zip_file)
+            puts "Deleting existing: #{zip_file}"
+            FileUtils.remove(zip_file)
+          end
+          
+          puts "Writing: #{zip_file}"
+          ZipFileGenerator.new(dest_dir, zip_file).write()
+        end
+      end
+    end
+  end
 end

data/lib/spader/commands/generate.rb

@@ -1,63 +1,67 @@
-require "spader/command"
-
-module Spader
-  class GenerateCommand < Command
-    attr_accessor :path, :title
-    
-    def execute()
-      super
-      puts "Generating \"#{@title}\" into #{@path}"
-      
-      if @path.nil?() || @path.empty?() || @title.nil?() || @title.empty?()
-        puts "Path and Title are required."
-        raise InvalidParametersError
-      end
-      
-      project = Project.generate(@path, :title => @title)
-      
-      if Dir.exists?(project.path)
-        puts "Removing existing dir..."
-        FileUtils.remove_dir(project.path)
-      end
-      
-      FileUtils.mkdir_p(project.path)
-      
-      project.save_json(project.path + "spader.json")
-      
-      new_dirs = [
-        "_locales/en",
-        "dist/development",
-        "dist/production",
-        "font",
-        "html",
-        "icon",
-        "js",
-        "manifest",
-        "promo",
-        "scss",
-        "txt",
-      ]
-      
-      new_dirs.each do |new_dir|
-        FileUtils.mkdir_p(project.path + new_dir)
-      end
-      
-      FileUtils.touch(project.path + "txt/README.md")
-      
-      messages = Messages.generate(project.title)
-      messages.save_json(project.path + "_locales/en/messages.json")
-      
-      manifest = Manifest.generate()
-      
-      BROWSERS.each do |browser|
-        if browser == "chrome"
-          manifest.document["update_url"] = "http://clients2.google.com/service/update2/crx"
-        else
-          manifest.document.delete("update_url")
-        end
-        
-        manifest.save_json(project.path + "manifest/#{browser}.json")
-      end
-    end
-  end
+# encoding: UTF-8
+
+require "spader/command"
+
+module Spader
+  class GenerateCommand < Command
+    attr_accessor :path, :title
+    
+    def execute()
+      super
+      puts "Generating \"#{@title}\" into #{@path}"
+      
+      if @path.nil?() || @path.empty?() || @title.nil?() || @title.empty?()
+        puts "Path and Title are required."
+        raise InvalidParametersError
+      end
+      
+      project = Project.generate(@path, :title => @title)
+      
+      if Dir.exists?(project.path)
+        puts "Removing existing dir..."
+        FileUtils.remove_dir(project.path)
+      end
+      
+      FileUtils.mkdir_p(project.path)
+      
+      project.save_json(project.path + "spader.json")
+      
+      new_dirs = [
+        "_locales/en",
+        "font",
+        "html",
+        "icon",
+        "js",
+        "manifest",
+        "promo",
+        "scss",
+        "txt",
+      ]
+      
+      Spader::ENVIRONMENTS.each do |env|
+        new_dirs << "dist/#{env}"
+      end
+      
+      new_dirs.each do |new_dir|
+        FileUtils.mkdir_p(project.path + new_dir)
+      end
+      
+      FileUtils.touch(project.path + "txt/README.md")
+      
+      messages = Messages.generate(project.title)
+      messages.save_json(project.path + "_locales/en/messages.json")
+      
+      manifest = Manifest.generate()
+      
+      #BROWSERS.each do |browser|
+        #if browser == "chrome"
+        #  manifest.document["update_url"] = "http://clients2.google.com/service/update2/crx"
+        #else
+        #  manifest.document.delete("update_url")
+        #end
+        
+        manifest.save_json(project.path + "manifest/manifest.json.erb")
+     # end
+    end
+  end
 end

data/lib/spader/document.rb

@@ -1,23 +1,25 @@
-module Spader
-  require "spader/util"
-  
-  class Document
-    attr_accessor :document
-    
-    def initialize()
-      @document = {}
-    end
-    
-    def load_json(path)
-      @document = JSON.parse(read_file(path))
-    end
-    
-    def save_json(path)
-      write_file(path, JSON.pretty_generate(@document))
-    end
-  end
-  
-  require "spader/documents/project"
-  require "spader/documents/manifest"
-  require "spader/documents/messages"
+# encoding: UTF-8
+
+module Spader
+  require "spader/util"
+  
+  class Document
+    attr_accessor :document
+    
+    def initialize()
+      @document = {}
+    end
+    
+    def load_json(path)
+      @document = JSON.parse(read_file(path))
+    end
+    
+    def save_json(path)
+      write_file(path, JSON.pretty_generate(@document))
+    end
+  end
+  
+  require "spader/documents/project"
+  require "spader/documents/manifest"
+  require "spader/documents/messages"
 end