ymdp 0.1.3.2 → 0.1.4

data/spec/spec_helper.rb

@@ -10,5 +10,7 @@ require 'ymdp'
 require 'spec'
 require 'spec/autorun'
 
+require 'stubs'
+
 Spec::Runner.configure do |config|
-end
+end

data/spec/stubs.rb

@@ -0,0 +1,42 @@
+
+def stub_screen_io
+  $stdout.stub!(:puts)
+  $stdout.stub!(:print)    
+end
+
+def stub_file_io(unprocessed_file="")
+  @file ||= mock('file').as_null_object
+  @file.stub!(:read).and_return(unprocessed_file)
+    
+  File.stub!(:exists?).and_return(false)
+  File.stub!(:open).and_yield(@file) 
+end
+
+def stub_file_utils
+  FileUtils.stub!(:rm)
+  FileUtils.stub!(:rm_rf)
+  FileUtils.stub!(:cp_r)
+  FileUtils.stub!(:mkdir_p)
+  F.stub!(:concat_files)
+end
+
+def stub_yaml(output_hash={})
+  YAML.stub!(:load_file).and_return(output_hash)
+end
+
+def stub_erb(processed_file="")
+  @erb ||= mock('erb').as_null_object
+  @erb.stub!(:result).and_return(processed_file)
+  ERB.stub!(:new).and_return(@erb)
+end
+
+def stub_git_helper
+  @git_helper = mock('git_helper').as_null_object
+  GitHelper.stub!(:new).and_return(@git_helper)
+end
+
+def stub_timer
+  @timer = mock('timer').as_null_object
+  @timer.stub!(:time).and_yield
+  Timer.stub!(:new).and_return(@timer)
+end

data/ymdp.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ymdp}
-  s.version = "0.1.3.2"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeff Coleman"]
@@ -88,8 +88,12 @@ Gem::Specification.new do |s|
      "lib/new_application/ymdp",
      "lib/ymdp.rb",
      "lib/ymdp/asset_tag_helper.rb",
+     "lib/ymdp/commands/build.rb",
      "lib/ymdp/commands/generate.rb",
-     "lib/ymdp/compiler/compiler.rb",
+     "lib/ymdp/compiler/base.rb",
+     "lib/ymdp/compiler/domains.rb",
+     "lib/ymdp/compiler/git_helper.rb",
+     "lib/ymdp/compiler/options.rb",
      "lib/ymdp/compiler/template.rb",
      "lib/ymdp/configuration/config.rb",
      "lib/ymdp/configuration/constants.rb",
@@ -99,18 +103,19 @@ Gem::Specification.new do |s|
      "lib/ymdp/generator/templates/view.html.haml",
      "lib/ymdp/helpers.rb",
      "lib/ymdp/processor/compressor.rb",
+     "lib/ymdp/processor/form_post.rb",
      "lib/ymdp/processor/processor.rb",
      "lib/ymdp/processor/validator.rb",
+     "lib/ymdp/processor/w3c.rb",
      "lib/ymdp/support/blank.rb",
      "lib/ymdp/support/file.rb",
-     "lib/ymdp/support/form_post.rb",
-     "lib/ymdp/support/git_helper.rb",
-     "lib/ymdp/support/w3c.rb",
      "lib/ymdp/tag_helper.rb",
      "lib/ymdp/tasks/keys.rake",
      "lib/ymdp/tasks/ymdp.rake",
      "lib/ymdp/translator/base.rb",
      "lib/ymdp/ymdp.rb",
+     "spec/compiler_spec.rb",
+     "spec/compiler_template_spec.rb",
      "spec/configuration_spec.rb",
      "spec/data/Rakefile",
      "spec/data/VERSION",
@@ -174,8 +179,10 @@ Gem::Specification.new do |s|
      "spec/data/script/ymdt",
      "spec/data/script/ymdt.old",
      "spec/data/script/yuicompressor-2.4.2.jar",
+     "spec/domains_spec.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb",
+     "spec/stubs.rb",
      "spec/translator_spec.rb",
      "spec/ymdp_spec.rb",
      "ymdp.gemspec"
@@ -186,11 +193,15 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{Framework for developing applications in the Yahoo! Mail Development Platform}
   s.test_files = [
-    "spec/configuration_spec.rb",
+    "spec/compiler_spec.rb",
+     "spec/compiler_template_spec.rb",
+     "spec/configuration_spec.rb",
      "spec/data/app/helpers/application_helper.rb",
      "spec/data/config/constants.rb",
      "spec/data/lib/init.rb",
+     "spec/domains_spec.rb",
      "spec/spec_helper.rb",
+     "spec/stubs.rb",
      "spec/translator_spec.rb",
      "spec/ymdp_spec.rb"
   ]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ymdp
 version: !ruby/object:Gem::Version 
-  version: 0.1.3.2
+  version: 0.1.4
 platform: ruby
 authors: 
 - Jeff Coleman
@@ -211,8 +211,12 @@ files:
 - lib/new_application/ymdp
 - lib/ymdp.rb
 - lib/ymdp/asset_tag_helper.rb
+- lib/ymdp/commands/build.rb
 - lib/ymdp/commands/generate.rb
-- lib/ymdp/compiler/compiler.rb
+- lib/ymdp/compiler/base.rb
+- lib/ymdp/compiler/domains.rb
+- lib/ymdp/compiler/git_helper.rb
+- lib/ymdp/compiler/options.rb
 - lib/ymdp/compiler/template.rb
 - lib/ymdp/configuration/config.rb
 - lib/ymdp/configuration/constants.rb
@@ -222,18 +226,19 @@ files:
 - lib/ymdp/generator/templates/view.html.haml
 - lib/ymdp/helpers.rb
 - lib/ymdp/processor/compressor.rb
+- lib/ymdp/processor/form_post.rb
 - lib/ymdp/processor/processor.rb
 - lib/ymdp/processor/validator.rb
+- lib/ymdp/processor/w3c.rb
 - lib/ymdp/support/blank.rb
 - lib/ymdp/support/file.rb
-- lib/ymdp/support/form_post.rb
-- lib/ymdp/support/git_helper.rb
-- lib/ymdp/support/w3c.rb
 - lib/ymdp/tag_helper.rb
 - lib/ymdp/tasks/keys.rake
 - lib/ymdp/tasks/ymdp.rake
 - lib/ymdp/translator/base.rb
 - lib/ymdp/ymdp.rb
+- spec/compiler_spec.rb
+- spec/compiler_template_spec.rb
 - spec/configuration_spec.rb
 - spec/data/Rakefile
 - spec/data/VERSION
@@ -297,8 +302,10 @@ files:
 - spec/data/script/ymdt
 - spec/data/script/ymdt.old
 - spec/data/script/yuicompressor-2.4.2.jar
+- spec/domains_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+- spec/stubs.rb
 - spec/translator_spec.rb
 - spec/ymdp_spec.rb
 - ymdp.gemspec
@@ -331,10 +338,14 @@ signing_key:
 specification_version: 3
 summary: Framework for developing applications in the Yahoo! Mail Development Platform
 test_files: 
+- spec/compiler_spec.rb
+- spec/compiler_template_spec.rb
 - spec/configuration_spec.rb
 - spec/data/app/helpers/application_helper.rb
 - spec/data/config/constants.rb
 - spec/data/lib/init.rb
+- spec/domains_spec.rb
 - spec/spec_helper.rb
+- spec/stubs.rb
 - spec/translator_spec.rb
 - spec/ymdp_spec.rb

data/lib/ymdp/compiler/compiler.rb

@@ -1,278 +0,0 @@
-module YMDP
-  module Compiler
-    # Command-line options processor for Compiler module.
-    #
-    class Options
-      # Parse command line options into an options hash.
-      #
-      def self.parse
-        options = {
-          :commit => false,
-          :branch => "master"
-        }
-        OptionParser.new do |opts|
-          options[:commit] = false
-          options[:verbose] = CONFIG.verbose?
-          opts.banner = "Usage: build.rb [options]"
-
-          opts.on("-d", "--domain [domain]", "Force Domain") do |v|
-            options[:domain] = v
-          end
-          opts.on("-b", "--branch [branch]", "Current Branch") do |v|
-            options[:branch] = v
-          end
-          opts.on("-m", "--message [message]", "Commit Message") do |v|
-            options[:commit] = true
-            options[:message] = v
-          end
-          opts.on("-n", "--no-commit", "Don't Commit") do |v|
-            options[:commit] = false
-          end
-          opts.on("-v", "--verbose", "Verbose (show all file writes)") do |v|
-            options[:verbose] = true
-          end
-          opts.on("-r", "--rake [task]", "Execute Rake task") do |v|
-            options[:rake] = v
-          end
-          opts.on("-c", "--compress", "Compress JavaScript and CSS") do |v|
-            options[:compress] = v
-          end
-        end.parse!
-    
-        options
-      end    
-    end
-  
-    # Covers all the domains and the actions that are taken on all domains at once.
-    #
-    class Domains
-      attr_accessor :git, :git_hash, :message, :domains, :options
-  
-      def initialize(options=nil)
-        @options = options || Compiler::Options.parse
-        @domains = @options[:domain] || all_domains
-        @domains = @domains.to_a
-        @message = @options[:message]
-
-        commit
-      end
-  
-      # Returns all domains.
-      #
-      def all_domains
-        SERVERS.servers.keys
-      end
-  
-      # Commit to git and store the hash of the commit.
-      #
-      def commit
-        @git = GitHelper.new
-        if options[:commit]
-          git.do_commit(@message)
-        end
-        @git_hash = git.get_hash(options[:branch])    
-      end
-  
-      # Compile the source code for all domains into their usable destination files.
-      #
-      def compile
-        Timer.new(:title => "YMDP").time do
-          clean_tmp_dir do
-            process_domains
-          end
-        end
-      rescue StandardError => e
-        puts e.message
-        puts e.backtrace
-      end
-  
-      # Process source code for each domain in turn.
-      #
-      def process_domains
-        domains.each do |domain|
-          compiler = Compiler::Base.new(domain, git_hash, options)
-          
-          compiler.clean_domain
-  
-          ["views", "assets"].each do |dir|
-            compiler.process("#{BASE_PATH}/app/#{dir}/")
-          end
-        end
-    
-        if options[:rake]
-          system "rake #{options[:rake]}"
-        end
-      end
-  
-      # Perform a block, starting with a clean 'tmp' directory and ending with one.
-      #
-      def clean_tmp_dir
-        system "rm -rf #{TMP_DIR}"
-        system "mkdir #{TMP_DIR}"
-        yield
-        system "rm -rf #{TMP_DIR}"
-        system "mkdir #{TMP_DIR}"
-      end
-    end
-
-    # Compiles the source code for an individual domain.
-    #
-    # Usage:
-    #
-    #   @compiler = Compiler::Base.new('staging', 'asdfh23rh2fas')
-    #
-    # You can then compile the domain:
-    #
-    #   @compiler.build
-    #
-    class Base
-      attr_accessor :domain, :git_hash, :options
-  
-      # A TemplateCompiler instance covers a single domain, handling all the processing necessary to 
-      # convert the application source code into usable destination files ready for upload.
-      #
-      def initialize(domain, git_hash, options)
-        @domain = domain
-        @git_hash = git_hash
-        @options = options
-      end
-
-      # Do all the processing necessary to convert the application source code into usable destination files ready for upload to the server:
-      #
-      # - create server directory if necessary,
-      # - for each file in the source path, build the file, and
-      # - copy the images from the source to the destination directory.
-      #
-      def process(path)
-        puts "Processing #{path} for #{domain}"
-        create_directory("servers/#{domain}")
-        process_all_files(path)
-        process_all_translations
-        copy_images
-      end
-  
-      # Process all code files (HTML and JavaScript) into usable, complete HTML files.
-      #
-      def process_all_files(path)
-        Dir["#{path}**/*"].each do |f|
-          build_file(f)
-        end    
-      end
-  
-      # Build this file if it's either:
-      #   - a view, but not a partial or layout, or
-      #   - a JavaScript file.
-      #
-      def build_file(file)
-        params = {
-          :file => file, :domain => domain, :git_hash => git_hash, :message => options[:message], :verbose => options[:verbose]
-        }
-        if build?(file)
-          if file =~ /(\.haml|\.erb)$/
-            YMDP::Template::View.new(params).build
-          elsif file =~ /\.js$/
-            YMDP::Template::JavaScript.new(params).build
-          end
-        end
-      end
-  
-      # Convert all YRB translation files from YRB ".pres" format into a single JSON file per language.
-      #
-      def process_all_translations
-        puts "Processing ./app/assets/yrb/ for #{domain}"
-        YMDP::Base.supported_languages.each do |lang|
-          process_each_yrb(lang)
-        end
-      end
-  
-      # Convert the YRB translation files of a single language for this domain into a single JSON file.
-      #
-      def process_each_yrb(lang)
-        tmp_file = "#{TMP_DIR}/keys_#{lang}.pres"
-    
-        # Concatenate together all the YRB ".pres" files for this language into one file in the tmp dir.
-        #
-        Dir["#{BASE_PATH}/app/assets/yrb/#{lang}/*"].each do |path|
-          system "cat #{path} >> #{tmp_file}"
-        end
-    
-        yrb = YMDP::Template::YRB.new(:file => tmp_file, :domain => domain)
-        yrb.build
-        yrb.validate if CONFIG.validate_json_assets?
-        system "rm #{tmp_file}"
-      end
-  
-      # Creates a fresh destination directory structure for the code to be compiled into.
-      #
-      def clean_domain
-        dir = "#{YMDP_ROOT}/servers/#{domain}"
-        system "rm -rf #{dir}/views"
-        system "rm -rf #{dir}/assets/javascripts"
-        system "rm -rf #{dir}/assets/stylesheets"
-        system "rm -rf #{dir}/assets/yrb"
-        system "rm -rf #{TMP_DIR}/"
-        system "mkdir #{TMP_DIR}"
-      end
-
-      # Format text in a standard way for output to the screen.
-      #
-      def log(text)
-        "#{Time.now.to_s} #{text}"
-      end
-  
-      # If this directory doesn't exist, create it and print that it's being created.
-      #
-      def create_directory(path)
-        dest = destination(path)
-    
-        unless File.exists?("#{BASE_PATH}/#{path}")
-          puts "     create #{path}"
-          FileUtils.mkdir_p "#{BASE_PATH}/#{path}"
-        end
-      end
-  
-      # Convert a file's path from its source to its destination.
-      #
-      # The source directory is in the 'app' directory.
-      #
-      # The destination directory is made from the 'servers' root and the domain name.
-      #
-      # For example: 
-      #   - ./servers/staging
-      #   - ./servers/alpha
-      #
-      def destination(path)
-        destination = path.dup
-        destination.gsub!("#{YMDP_ROOT}/app", "#{YMDP_ROOT}/servers/#{domain}")
-      end
-  
-      # Images don't require any processing, just copy them over into this domain's assets directory.
-      #
-      def copy_images
-        if options[:verbose]
-          puts log("Moving images into #{YMDP_ROOT}/servers/#{domain}/assets/images...")
-        end
-        system "rm -rf #{YMDP_ROOT}/servers/#{domain}/assets/images"
-        system "cp -r #{YMDP_ROOT}/app/assets/images #{YMDP_ROOT}/servers/#{domain}/assets"
-      end
-  
-      # A filename beginning with an underscore is a partial.
-      #
-      def partial?(file)
-        file.split("/").last =~ /^_/
-      end
-  
-      # A file in the layouts directory is a layout.
-      #
-      def layout?(file)
-        file =~ /\/app\/views\/layouts\//
-      end
-  
-      # Build if it's not a partial and not a layout.
-      #
-      def build?(file)
-        !partial?(file) && !layout?(file)
-      end
-    end
-  end
-end