ymdp 0.1.4 → 0.1.6

data/lib/ymdp/configuration/constants.rb

@@ -1,5 +1,19 @@
-YMDP_ROOT = BASE_PATH unless defined?(YMDP_ROOT)
-TMP_DIR = TMP_PATH unless defined?(TMP_DIR)
-
 CONFIG = YMDP::Configuration::Config.new unless defined?(CONFIG)
 SERVERS = YMDP::Configuration::Servers.new unless defined?(SERVERS)
+
+@content_variables = YAML.load_file("#{CONFIG_PATH}/content.yml")
+
+YMDP::Base.configure do |config|
+  config.username = CONFIG["username"]
+  config.password = CONFIG["password"]
+  config.default_server = CONFIG["default_server"]
+  config.growl = CONFIG["growl"]
+  config.verbose = CONFIG["verbose"]
+  config.compress = CONFIG["compress"]
+  config.validate = CONFIG["validate"]
+  
+  config.add_path(:base_path, BASE_PATH)
+  config.servers = SERVERS
+  
+  config.content_variables = @content_variables
+end

data/lib/ymdp/processor/form_post.rb

@@ -3,7 +3,11 @@
 require 'rubygems'
 require 'mime/types'
 require 'net/http'
-require 'CGI'
+begin
+  require 'CGI'
+rescue StandardError => e
+  puts e.message
+end
  
 class FormField
   attr_accessor :name, :value

data/lib/ymdp/support/file.rb

@@ -1,17 +1,23 @@
 module YMDP
+  # Some useful methods that make working with files easier.
+  #
   module FileSupport
-    # Concatenate together the contents of the input_path into the output_file.
+    # Concatenates together the contents of all the files in the <tt>source_path</tt> 
+    # into the <tt>destination_path</tt>.
     #
-    def concat_files(input_path, output_file)
-      File.open(output_file, "a") do |output|
-        Dir[input_path].each do |path|
+    def concat_files(source_path, destination_path)
+      File.open(destination_path, "a") do |output|
+        Dir[source_path].each do |path|
           File.open(path) do |f|
             output.puts f.read
           end
         end
-      end        
+      end
     end
     
+    # If the file at <tt>path</tt> exists, prompt the user to overwrite it. If the file doesn't
+    # exist, return true.
+    #
     def confirm_overwrite(path)
       if File.exists?(path)
         $stdout.puts "File exists: #{File.expand_path(path)}"
@@ -24,23 +30,29 @@ module YMDP
       end          
     end
     
-    # friendlier display of paths
+    # Parses out the <tt>BASE_PATH</tt> constant from filenames to display them in a 
+    # friendlier way.
+    # 
+    # TODO: Refactor this so it doesn't use a constant.
+    #
     def display_path(path)
       path = File.expand_path(path)
       path.gsub(BASE_PATH, "")
     end
     
-    # saves the output string to the filename given
+    # Saves the <tt>output</tt> string to the <tt>destination_path</tt> given
     #
-    def save_to_file(output, filename)
-      unless File.exists?(filename)      
-        File.open(filename, "w") do |w|
+    def save_to_file(output, destination_path)
+      unless File.exists?(destination_path)      
+        File.open(destination_path, "w") do |w|
           w.write(output)
         end
       end
     end
   
-    # given a path and line number, returns the line and two lines previous
+    # Given a <tt>path</tt> and <tt>line_number</tt>, returns the line and two lines previous
+    #
+    # Used for displaying validation errors.
     #
     def get_line_from_file(path, line_number)
       line_number = line_number.to_i
@@ -65,9 +77,15 @@ module YMDP
   end
 end
 
+# Provide a wrapper around system calls so they can be mocked in tests.
+#
 class F
   extend YMDP::FileSupport
   
+  # Execute a system command. If the parameter <tt>:return</tt> is true, execute the command
+  # with the backtick (`) command and return the results.  Otherwise, just execute the command
+  # and let the output go to the screen.
+  #
   def self.execute(command, params={})
     if params[:return]
       `#{command}`

data/lib/ymdp/tasks/keys.rake

@@ -5,7 +5,7 @@ require 'translator/base'
 @key = ENV["key"] || ""
 @key = @key.upcase
 
-ASSETS_ROOT = "#{YMDP_ROOT}/app/assets"
+ASSETS_ROOT = "#{BASE_PATH}/app/assets"
 YRB_ROOT = "#{ASSETS_ROOT}/yrb"
 
 namespace :keys do
@@ -35,7 +35,7 @@ namespace :keys do
   end
   
   task :combine do
-    system "rm #{TMP_DIR}/*"
+    system "rm #{TMP_PATH}/*"
     each_locale do |path|
       puts path
       filename = path.split("/").last
@@ -45,20 +45,20 @@ namespace :keys do
       end
       
       File.open(path, "r") do |f|
-        File.open("#{TMP_DIR}/keys_#{lang}.pres", "a") do |tmp|
+        File.open("#{TMP_PATH}/keys_#{lang}.pres", "a") do |tmp|
           tmp.write(f.read)
         end
       end
     end
     
     system "rm -rf #{YRB_ROOT}/*"
-    system "cp #{TMP_DIR}/* #{YRB_ROOT}"
+    system "cp #{TMP_PATH}/* #{YRB_ROOT}"
     
-    system "rm #{TMP_DIR}/*"
+    system "rm #{TMP_PATH}/*"
   end
   
   task :destroy do
-    system "rm #{TMP_DIR}/*"
+    system "rm #{TMP_PATH}/*"
     
     raise "Must define a key with 'key='" if @key == ""
     
@@ -72,7 +72,7 @@ namespace :keys do
       line
     end
     
-    system "rm #{TMP_DIR}/*"
+    system "rm #{TMP_PATH}/*"
   end
   
   desc "Translate any new keys into non-US languages"
@@ -81,7 +81,7 @@ namespace :keys do
   end
   
   task :rename do
-    system "rm #{TMP_DIR}/*"
+    system "rm #{TMP_PATH}/*"
     
     @to = ENV["to"] || ""
     @to = @to.upcase
@@ -99,7 +99,7 @@ namespace :keys do
       line
     end
     
-    system "rm #{TMP_DIR}/*"
+    system "rm #{TMP_PATH}/*"
   end
   
   # task :unused do
@@ -169,14 +169,14 @@ def change_keys
     puts path
     filename = path.split("/").last
     File.open(path, "r") do |f|
-      File.open("#{TMP_DIR}/#{filename}", "w") do |tmp|
+      File.open("#{TMP_PATH}/#{filename}", "w") do |tmp|
         f.readlines.each do |line|
           new_line = yield line
           tmp.write new_line
         end
       end
     end
-    system "cp #{TMP_DIR}/#{filename} #{path}"
+    system "cp #{TMP_PATH}/#{filename} #{path}"
   end
 end
 
@@ -189,14 +189,14 @@ def change_keys_with_lang
       lang = $1
     end
     File.open(path, "r") do |f|
-      File.open("#{TMP_DIR}/#{filename}", "w") do |tmp|
+      File.open("#{TMP_PATH}/#{filename}", "w") do |tmp|
         f.readlines.each do |line|
           new_line = yield line, lang, filename
           tmp.write new_line
         end
       end
     end
-    system "cp #{TMP_DIR}/#{filename} #{path}"
+    system "cp #{TMP_PATH}/#{filename} #{path}"
   end
 end
 

data/lib/ymdp/tasks/ymdp.rake

@@ -8,7 +8,7 @@ rescue
   CATEGORIES = {} unless defined?(CATEGORIES)
 end
 
-Dir.mkdir(TMP_DIR) rescue Errno::EEXIST
+Dir.mkdir(TMP_PATH) rescue Errno::EEXIST
 
 def set_application_variables(application)
   @application = application
@@ -287,8 +287,8 @@ namespace :validate do
   desc "Validates all HTML"
   task :html do
     puts "\nValidating HTML in #{@application}..."
-    `rm -rf #{TMP_DIR}`
-    Dir.mkdir(TMP_DIR) rescue Errno::EEXIST
+    `rm -rf #{TMP_PATH}`
+    Dir.mkdir(TMP_PATH) rescue Errno::EEXIST
     Dir["./servers/#{@application}/views/*"].each do |filename|
       YMDP::Validator::HTML.validate(filename) if filename =~ /#{@path}/
     end    
@@ -491,7 +491,7 @@ def validated_embedded_js(path)
     Hpricot(f) 
   }
   
-  js_fragment_path = TMP_DIR + "/#{File.basename(path)}_js_fragment"
+  js_fragment_path = TMP_PATH + "/#{File.basename(path)}_js_fragment"
 
   File.open(js_fragment_path,'w') do |f|
     (doc / "script").each { |js| f.puts js.inner_html + "\n\n" }

data/spec/application_spec.rb

@@ -0,0 +1,29 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe Application do
+  describe "set current view" do
+    it "should set current view" do
+      Application.current_view = "staging"
+      Application.current_view.should == "staging"
+    end
+  end
+  
+  describe "current_view?" do
+    it "should be true" do
+      Application.current_view = "staging"
+      Application.current_view?("staging")
+    end
+    
+    it "should be false" do
+      Application.current_view = "staging"
+      Application.current_view?("funk")
+    end
+  end
+  
+  describe "return current view" do
+    it "should return current view" do
+      Application.current_view = "staging"
+      Application.current_view.should == "staging"
+    end
+  end
+end

data/spec/application_view_spec.rb

@@ -0,0 +1,5 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "ApplicationView" do
+
+end

data/spec/compiler_spec.rb

@@ -17,7 +17,7 @@ describe "Compiler" do
     @git_hash = 'asdfh23rh2fas'
     @base_path = "."
     
-    @compiler = YMDP::Compiler::Base.new(@domain, @git_hash, :base_path => @base_path)
+    @compiler = YMDP::Compiler::Base.new(@domain, @git_hash, :base_path => @base_path, :server => "staging")
   end
     
   describe "instantiation" do
@@ -36,7 +36,7 @@ describe "Compiler" do
   
   describe "process" do
     before(:each) do
-      YMDP::Base.stub!(:supported_languages).and_return([])
+      YMDP::ApplicationView.stub!(:supported_languages).and_return([])
       
       @view_template = mock('view_template').as_null_object
       YMDP::Compiler::Template::View.stub!(:new).and_return(@view_template)
@@ -56,7 +56,7 @@ describe "Compiler" do
     describe "translations" do
       before(:each) do
         @supported_languages = ["en-US", "de-DE"]
-        YMDP::Base.stub!(:supported_languages).and_return(@supported_languages)
+        YMDP::ApplicationView.stub!(:supported_languages).and_return(@supported_languages)
       end
       
       it "should act on the list of supported languages" do

data/spec/compiler_template_spec.rb

@@ -6,62 +6,31 @@ require 'compiler/template'
 
 describe "Compiler" do
   before(:each) do
-    Object.send(:remove_const, :YMDP_ENV)
-    YMDP_ENV = "build"
-    
-    Object.send(:remove_const, :CONFIG)
-    CONFIG = mock('config').as_null_object
+    reset_constant(:YMDP_ENV, "build")
+    reset_constant(:CONFIG, mock('config').as_null_object)
 
     Application.stub!(:current_view=)
     
-    stub_screen_io
-    stub_file_io
-    stub_file_utils
-    stub_yaml
+    stub_io
   end
   
   describe "view" do
     before(:each) do
-        @domain = "staging"
-        @filename = "filename.html.haml"
-        @git_hash = "asjkhfasjkfhjk"
-        @message = "This is a commit message."
-        
-        @params = {
-          :verbose => false,
-          :domain => @domain,
-          :file => @filename,
-          :git_hash => @git_hash,
-          :message => @message
-        }
-        @content_variables = {
-          "version" => "0.1.0",
-          "sprint_name" => "Gorgonzola"
-        }
-        YAML.stub!(:load_file).with(/content\.yml$/).and_return(@content_variables)
-        
-        
-    
-        @servers = {
-          "staging" => {
-            "server" => "staging",
-            "application_id" => "12345",
-            "assets_id" => "abcdefg_1"
-          },
+      @domain = "staging"
+      @filename = "filename.html.haml"
+      @git_hash = "asjkhfasjkfhjk"
+      @message = "This is a commit message."
       
-          "production" => {
-            "server" => "www",
-            "application_id" => "678910",
-            "assets_id" => "hijklmno_1"
-          }
-        }
-        @servers.stub!(:servers).and_return(@servers)
-        @base_path = "."
-        
-        YMDP::Compiler::Template::Base.servers = @servers
-        YMDP::Compiler::Template::Base.base_path = @base_path
-        
-        @view_template = YMDP::Compiler::Template::View.new(@params)
+      @params = {
+        :verbose => false,
+        :domain => @domain,
+        :file => @filename,
+        :git_hash => @git_hash,
+        :message => @message
+      }
+      stub_yrb_configuration
+      
+      @view_template = YMDP::Compiler::Template::View.new(@params)
     end
     
     describe "instantiation" do
@@ -78,18 +47,13 @@ describe "Compiler" do
       end
       
       it "should set server" do
-        @view_template.server.should == @servers["server"]
+        @view_template.server.should == "staging"
       end
       
       it "should set file" do
         @view_template.file.should == @filename
       end
       
-      it "should get content variables from yml file" do
-        YAML.should_receive(:load_file).with(/content\.yml$/)
-        @view_template = YMDP::Compiler::Template::View.new(@params)
-      end
-      
       it "should set content variables" do
         @view_template.instance_variable_get("@version").should == @content_variables["version"]
         @view_template.instance_variable_get("@sprint_name").should == @content_variables["sprint_name"]
@@ -100,5 +64,13 @@ describe "Compiler" do
         @view_template = YMDP::Compiler::Template::View.new(@params)
       end
     end
+    
+    describe "validation" do
+      it "should raise an error without a server" do
+        lambda {
+          @view_template = YMDP::Compiler::Template::View.new(@params.merge({:domain => "nowhere"}))
+        }.should raise_error
+      end
+    end
   end
 end

data/spec/data/app/views/layouts/application.html.haml

@@ -6,6 +6,8 @@
       = "'#{@view}' view for #{@domain}: #{@server}"
       = "built at #{Time.now}"
       = "commit #{@hash}, '#{@message}'"
+      
+    - raise "No server" unless @server
 
     %title= "#{@view} view for #{@domain}: #{@server}"
 

data/spec/data/config/config.yml

@@ -15,6 +15,7 @@ config:
     js_assets: true
   validate:
     html: 
+      doctype: HTML 4.0 Transitional
       build: true
       deploy: true
     embedded_js:

data/spec/data/config/constants.rb

@@ -26,8 +26,6 @@ SORTED_LOCALES = LOCALES.sort do |a,b|
   a[1] <=> b[1]
 end unless defined?(SORTED_LOCALES)
 
-YMDP_ROOT = "." unless defined?(YMDP_ROOT)
-
 def file_not_found(filename)
   puts
   puts "Create #{filename} with the following command:\n\n  ./script/config" 
@@ -36,21 +34,19 @@ def file_not_found(filename)
   raise "File not found: #{filename}"  
 end
 
-servers = "#{YMDP_ROOT}/config/servers.yml"
-config = "#{YMDP_ROOT}/config/config.yml"
+servers = "#{BASE_PATH}/config/servers.yml"
+config = "#{BASE_PATH}/config/config.yml"
 
 if File.exists?(servers)
-  # SERVERS = YAML.load_file("#{YMDP_ROOT}/config/servers.yml") unless defined?(SERVERS)
   SERVERS = YMDP::Configuration::Servers.new
 else
   file_not_found(servers)
 end
 
 if File.exists?(config)
-  # CONFIG = YAML.load_file("#{YMDP_ROOT}/config/config.yml")["config"] unless defined?(CONFIG)
   CONFIG = YMDP::Configuration::Config.new
 else
   file_not_found(config)
 end
 
-TMP_DIR = "./tmp" unless defined?(TMP_DIR)
+TMP_PATH = "./tmp" unless defined?(TMP_PATH)