ymdp 0.1.1 → 0.1.3

data/lib/ymdp/processor/compressor.rb

@@ -3,7 +3,6 @@ require 'support/file'
 module YMDP
   module Compressor
     class Base
-      extend YMDP::Config
       extend YMDP::FileSupport
   
       def self.compress(path, options={})
@@ -16,10 +15,10 @@ module YMDP
           $stdout.print "   #{compressed_display_path}  compressing . . . "
           compressed = ''
         
-          if !obfuscate?
+          if options.delete("obfuscate")
             options["nomunge"] = ""
           end
-          if verbose?
+          if options.delete("verbose")
             options["verbose"] = ""
           end
           options["charset"] = "utf-8"
@@ -64,17 +63,13 @@ module YMDP
     
     class Stylesheet < Base
       def self.compress(path)
-        if compress_css?
-          super(path, "type" => "css")
-        end
+        super(path, "type" => "css")
       end
     end
     
     class JavaScript < Base      
       def self.compress(filename)
-        if compress_embedded_js?
-          super(filename, "type" => "js")
-        end
+        super(filename, "type" => "js")
       end
     end
   end

data/lib/ymdp/processor/validator.rb

@@ -3,7 +3,7 @@ require 'support/file'
 module YMDP
   module Validator
     class Base
-      extend YMDP::Config
+      # extend YMDP::Config
       extend YMDP::FileSupport
     end
     
@@ -35,14 +35,8 @@ module YMDP
     end
     
     class JavaScript < Base
-      def self.validate?
-        validate_embedded_js?
-      end
-      
       def self.validate(filename)
-        if validate?
-          validate_javascript(filename)
-        end
+        validate_javascript(filename)
       end
       
       def self.use_jslint_settings?
@@ -108,10 +102,6 @@ JSLINT
     end
     
     class JSON < JavaScript
-      def self.validate?
-        validate_json_assets?
-      end
-      
       def pre_process(output)
         output
       end

data/lib/ymdp/support/git_helper.rb

@@ -0,0 +1,23 @@
+require 'grit'
+include Grit
+
+class GitHelper
+  def get_hash(branch)
+    branch = get_current_branch || "master"
+    repo = Repo.new("#{BASE_PATH}/.")
+    repo.commits(branch).first.id
+  end
+
+  def get_current_branch
+    result = `git status`
+    if result =~ /# On branch (.*)/
+      return $1
+    end
+  end
+
+  def do_commit(message)
+    repo = Repo.new(".")
+    repo.add(".")
+    puts `git commit -am "#{message}"`
+  end
+end

data/lib/ymdp/tasks/ymdp.rake

@@ -1,6 +1,6 @@
-require 'deploy/ymdt'
+require 'ymdt'
 
-include YMDP::Config
+# include YMDP::Config
 
 begin
   CATEGORIES = YAML.load_file("./config/categories.yml")["categories"] unless defined?(CATEGORIES)
@@ -19,7 +19,7 @@ rescue
 end
 
 def create_from_servers
-  SERVERS.keys.each do |key|
+  SERVERS.each do |key, values|
     yield key.to_sym, "set_#{key}".to_sym
   end
 end
@@ -68,10 +68,10 @@ set_application_variables(@application)
 
 @sync = ENV["sync"]
 
-@validate_html = (ENV["validate_html"] || CONFIG["validate_html"].to_s) != "false"
-@validate_js_assets = (ENV["validate_js_assets"] || CONFIG["validate_js_assets"].to_s) != "false"
-@validate_json_assets = (ENV["validate_json_assets"] || CONFIG["validate_json_assets"].to_s) != "false"
-@validate_embedded_js = (ENV["validate_embedded_js"] || CONFIG["validate_embedded_js_deploy"].to_s) != "false"
+# @validate_html = (ENV["validate_html"] || CONFIG["validate_html"].to_s) != "false"
+# @validate_js_assets = (ENV["validate_js_assets"] || CONFIG["validate_js_assets"].to_s) != "false"
+# @validate_json_assets = (ENV["validate_json_assets"] || CONFIG["validate_json_assets"].to_s) != "false"
+# @validate_embedded_js = (ENV["validate_embedded_js"] || CONFIG["validate_embedded_js_deploy"].to_s) != "false"
 
 create_from_servers do |key, set_task|
   task set_task do
@@ -475,7 +475,7 @@ end
 # END OF RAKE TASKS
 
 def time(message="")
-  Timer.new(:title => "YMDP", :growl => growl?).time(message) do
+  Timer.new(:title => "YMDP", :growl => CONFIG.growl?).time(message) do
     yield
   end
 end
@@ -504,10 +504,10 @@ end
 def deploy(application, path)
   puts "\nDeploying #{application}: #{path}"
 
-  Rake::Task["validate:html"].invoke if validate_html?
-  Rake::Task["validate:embedded_js"].invoke if validate_embedded_js?
-  Rake::Task["validate:#{application}:javascripts"].invoke if validate_js_assets?
-  Rake::Task["validate:#{application}:json"].invoke if validate_json_assets?
+  Rake::Task["validate:html"].invoke if CONFIG.validate_html?
+  Rake::Task["validate:embedded_js"].invoke if CONFIG.validate_embedded_js?
+  Rake::Task["validate:#{application}:javascripts"].invoke if CONFIG.validate_js_assets?
+  Rake::Task["validate:#{application}:json"].invoke if CONFIG.validate_json_assets?
 
   ymdt.put(:application => application, :path => path)
 end
@@ -515,10 +515,10 @@ end
 def deploy_path(application, path)
   puts "\nDeploying #{application}: #{path}"
 
-  Rake::Task["validate:html"].invoke if validate_html?
-  Rake::Task["validate:embedded_js"].invoke if validate_embedded_js?
-  Rake::Task["validate:#{application}:javascripts"].invoke if validate_js_assets?
-  Rake::Task["validate:#{application}:json"].invoke if validate_json_assets?
+  Rake::Task["validate:html"].invoke if CONFIG.validate_html?
+  Rake::Task["validate:embedded_js"].invoke if CONFIG.validate_embedded_js?
+  Rake::Task["validate:#{application}:javascripts"].invoke if CONFIG.validate_js_assets?
+  Rake::Task["validate:#{application}:json"].invoke if CONFIG.validate_json_assets?
 
   dir = "./servers/#{application}"
 

data/lib/ymdp/translator/base.rb

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'rtranslate'
 require 'timer'
-require 'compiler/template_compiler'
+require 'compiler/template'
 
 module YMDP
   module Yaml

data/lib/ymdp/ymdp.rb

@@ -1,7 +1,5 @@
-require 'config'
 require 'processor/compressor'
 require 'processor/validator'
-require 'support/file'
 
 class Application
   def self.current_view?(view)
@@ -19,7 +17,7 @@ end
 
 module YMDP
   module Base
-    include YMDP::Config
+    # include YMDP::Config
     include YMDP::FileSupport
     include YMDP::Compressor
     
@@ -119,7 +117,7 @@ module YMDP
       output = ''
       if File.exists?(path)
         tmp_filename = save_processed_template(path)
-        if compress_css?
+        if CONFIG.compress_css?
           output = YMDP::Compressor::Stylesheet.compress(tmp_filename)
         else
           File.open(path) do |f|

data/lib/ymdp.rb

@@ -7,6 +7,7 @@ $LOAD_PATH.unshift dir unless $LOAD_PATH.include?(dir)
 # load application
 #
 
+require 'rubygems'
 require 'erb'
 require 'set'
 
@@ -17,8 +18,8 @@ Dir["#{dir}/*.rb"].each do |path|
   require File.expand_path(path)
 end
 
-# load support
-#
-Dir["#{dir}/support/*.rb"].each do |path|
-  require File.expand_path(path)
+["support", "configuration"].each do |directory|
+  Dir["#{dir}/#{directory}/*.rb"].each do |path|
+    require File.expand_path(path)
+  end
 end

data/spec/configuration_spec.rb

@@ -0,0 +1,39 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "Configuration" do
+  describe "Config" do
+    before(:each) do
+      @config_yml = {
+        "config" => {
+          "username" => "captmal",
+          "password" => "iluvinara",
+          "growl" => true
+        }
+      }
+      YAML.stub!(:load_file).and_return(@config_yml)
+      @config = YMDP::Configuration::Config.new
+    end
+    
+    it "should return username" do
+      @config.username.should == @config_yml["config"]["username"]
+    end
+    
+    it "should return password" do
+      @config.password.should == @config_yml["config"]["password"]
+    end
+    
+    it "should return growl" do
+      @config.growl?.should == @config_yml["config"]["growl"]
+    end
+    
+    describe "[]" do
+      it "should return username" do
+        @config["username"].should == @config_yml["config"]["username"]
+      end
+    
+      it "should return password" do
+        @config["password"].should == @config_yml["config"]["password"]
+      end
+    end
+  end
+end

data/spec/data/config/config.yml

@@ -2,6 +2,7 @@ config:
   username: user
   password: password
   default_server: staging
+  host: myserver.com
   production_server: my
   doctype: HTML 4.0 Transitional
   growl: false

data/spec/data/config/constants.rb

@@ -40,13 +40,15 @@ servers = "#{YMDP_ROOT}/config/servers.yml"
 config = "#{YMDP_ROOT}/config/config.yml"
 
 if File.exists?(servers)
-  SERVERS = YAML.load_file("#{YMDP_ROOT}/config/servers.yml") unless defined?(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 = YAML.load_file("#{YMDP_ROOT}/config/config.yml")["config"] unless defined?(CONFIG)
+  CONFIG = YMDP::Configuration::Config.new
 else
   file_not_found(config)
 end

data/spec/spec_helper.rb

@@ -1,11 +1,14 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+
+BASE_PATH = File.dirname(__FILE__) + "/data"
+CONFIG_PATH = "#{BASE_PATH}/config"
+SERVERS_PATH = "#{BASE_PATH}/servers"
+TMP_PATH = "#{BASE_PATH}/tmp"
+
 require 'ymdp'
 require 'spec'
 require 'spec/autorun'
 
 Spec::Runner.configure do |config|
-  BASE_PATH = "./"
-  SERVERS_PATH = "#{BASE_PATH}/servers"
-  TMP_PATH = "#{BASE_PATH}/tmp"
 end

data/spec/translator_spec.rb

@@ -3,7 +3,4 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 require 'translator/base'
 
 describe "Translator" do
-  it "should set base_path" do
-    BASE_PATH.should == "./"
-  end
 end

data/ymdp.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ymdp}
-  s.version = "0.1.1"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeff Coleman"]
-  s.date = %q{2010-01-13}
+  s.date = %q{2010-01-14}
   s.default_executable = %q{ymdp}
   s.description = %q{Framework for developing applications in the Yahoo! Mail Development Platform.}
   s.email = %q{progressions@gmail.com}
@@ -89,9 +89,10 @@ Gem::Specification.new do |s|
      "lib/ymdp.rb",
      "lib/ymdp/asset_tag_helper.rb",
      "lib/ymdp/commands/generate.rb",
-     "lib/ymdp/compiler/template_compiler.rb",
-     "lib/ymdp/config.rb",
-     "lib/ymdp/deploy/ymdt.rb",
+     "lib/ymdp/compiler/compiler.rb",
+     "lib/ymdp/compiler/template.rb",
+     "lib/ymdp/configuration/config.rb",
+     "lib/ymdp/configuration/constants.rb",
      "lib/ymdp/generator/base.rb",
      "lib/ymdp/generator/templates/javascript.js",
      "lib/ymdp/generator/templates/stylesheet.css",
@@ -105,13 +106,14 @@ Gem::Specification.new do |s|
      "lib/ymdp/support/blank.rb",
      "lib/ymdp/support/file.rb",
      "lib/ymdp/support/form_post.rb",
-     "lib/ymdp/support/string_masker.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/configuration_spec.rb",
      "spec/data/Rakefile",
      "spec/data/VERSION",
      "spec/data/app/.gitignore",
@@ -178,7 +180,6 @@ Gem::Specification.new do |s|
      "spec/spec_helper.rb",
      "spec/translator_spec.rb",
      "spec/ymdp_spec.rb",
-     "spec/ymdt_spec.rb",
      "ymdp.gemspec"
   ]
   s.homepage = %q{http://github.com/progressions/ymdp}
@@ -187,13 +188,13 @@ 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/data/app/helpers/application_helper.rb",
+    "spec/configuration_spec.rb",
+     "spec/data/app/helpers/application_helper.rb",
      "spec/data/config/constants.rb",
      "spec/data/lib/init.rb",
      "spec/spec_helper.rb",
      "spec/translator_spec.rb",
-     "spec/ymdp_spec.rb",
-     "spec/ymdt_spec.rb"
+     "spec/ymdp_spec.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -211,6 +212,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<progressions-g>, [">= 0"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<timer>, [">= 0"])
+      s.add_development_dependency(%q<serenity>, [">= 0"])
     else
       s.add_dependency(%q<haml>, [">= 0"])
       s.add_dependency(%q<json>, [">= 0"])
@@ -222,6 +224,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<progressions-g>, [">= 0"])
       s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<timer>, [">= 0"])
+      s.add_dependency(%q<serenity>, [">= 0"])
     end
   else
     s.add_dependency(%q<haml>, [">= 0"])
@@ -234,6 +237,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<progressions-g>, [">= 0"])
     s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<timer>, [">= 0"])
+    s.add_dependency(%q<serenity>, [">= 0"])
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ymdp
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors: 
 - Jeff Coleman
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-13 00:00:00 -06:00
+date: 2010-01-14 00:00:00 -06:00
 default_executable: ymdp
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -112,6 +112,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: serenity
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: Framework for developing applications in the Yahoo! Mail Development Platform.
 email: progressions@gmail.com
 executables: 
@@ -192,9 +202,10 @@ files:
 - lib/ymdp.rb
 - lib/ymdp/asset_tag_helper.rb
 - lib/ymdp/commands/generate.rb
-- lib/ymdp/compiler/template_compiler.rb
-- lib/ymdp/config.rb
-- lib/ymdp/deploy/ymdt.rb
+- lib/ymdp/compiler/compiler.rb
+- lib/ymdp/compiler/template.rb
+- lib/ymdp/configuration/config.rb
+- lib/ymdp/configuration/constants.rb
 - lib/ymdp/generator/base.rb
 - lib/ymdp/generator/templates/javascript.js
 - lib/ymdp/generator/templates/stylesheet.css
@@ -208,13 +219,14 @@ files:
 - lib/ymdp/support/blank.rb
 - lib/ymdp/support/file.rb
 - lib/ymdp/support/form_post.rb
-- lib/ymdp/support/string_masker.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/configuration_spec.rb
 - spec/data/Rakefile
 - spec/data/VERSION
 - spec/data/app/.gitignore
@@ -281,7 +293,6 @@ files:
 - spec/spec_helper.rb
 - spec/translator_spec.rb
 - spec/ymdp_spec.rb
-- spec/ymdt_spec.rb
 - ymdp.gemspec
 has_rdoc: true
 homepage: http://github.com/progressions/ymdp
@@ -312,10 +323,10 @@ signing_key:
 specification_version: 3
 summary: Framework for developing applications in the Yahoo! Mail Development Platform
 test_files: 
+- spec/configuration_spec.rb
 - spec/data/app/helpers/application_helper.rb
 - spec/data/config/constants.rb
 - spec/data/lib/init.rb
 - spec/spec_helper.rb
 - spec/translator_spec.rb
 - spec/ymdp_spec.rb
-- spec/ymdt_spec.rb