ymdp 0.1.0 → 0.1.1

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Jeff Coleman
+Copyright (c) 2010 Capital Thought
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -27,36 +27,30 @@ rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
+
+require 'spec/rake/spectask'
+Spec::Rake::SpecTask.new(:spec) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.spec_files = FileList['spec/**/*_spec.rb']
+  spec.spec_opts = ['-c']
 end
 
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/test_*.rb'
-    test.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
+Spec::Rake::SpecTask.new(:rcov) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rcov = true
 end
 
-task :test => :check_dependencies
+task :spec => :check_dependencies
 
-task :default => :test
+task :default => :spec
 
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "ymdp #{version}"
+  rdoc.title = "translator #{version}"
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/new_application/Gemfile

@@ -8,5 +8,6 @@ gem "sishen-rtranslate"
 gem "basepath"
 gem "rake"
 gem "ymdp"
+gem "timer"
 
 disable_system_gems

data/lib/ymdp/compiler/template_compiler.rb

@@ -1,3 +1,5 @@
+require 'grit'
+
 include Grit
 
 include YMDP::Config
@@ -33,11 +35,20 @@ module TemplateBuilder
     @hash = git_hash
     @message = message
     @subdir = subdir
-    @version = CONFIG["version"]
-    @sprint_name = CONFIG["sprint_name"]
+    
+    set_content_variables
+    
     @view = base_filename(@file.split("/").last)
     Application.current_view = @view
   end
+  
+  def set_content_variables
+    content = YAML.load_file("#{BASE_PATH}/config/content.yml")
+    content.each do |key, value|
+      attribute = "@#{key}"
+      instance_variable_set(attribute, value) unless instance_variable_defined?(attribute)
+    end
+  end
 
   def build
     unless @file =~ /#{YMDP_ROOT}\/app\/views\/_/
@@ -108,7 +119,12 @@ end
 class YMDPTemplate
   include ActionView::Helpers::TagHelper
   include TemplateBuilder
-  include ApplicationHelper
+  
+  begin
+    include ApplicationHelper
+  rescue NameError 
+  end
+    
   include YMDP::Base
   include YMDP::AssetTagHelper
   include YMDP::FormTagHelper

data/lib/ymdp/config.rb

@@ -61,5 +61,9 @@ module YMDP
     def verbose?
       config("verbose")
     end
+    
+    def growl?
+      config("growl")
+    end
   end
 end

data/lib/ymdp/deploy/ymdt.rb

@@ -0,0 +1,118 @@
+module YMDT
+  class System
+    def self.execute(command, params={})
+      if params[:return]
+        `#{command}`
+      else
+        system command
+      end
+    end
+  end
+  
+  class Base
+    attr_accessor :username, :password, :script_path
+  
+    def initialize(params={})
+      @username = params[:username]
+      @password = params[:password]
+      unless @username
+        raise ArgumentError.new("username required")
+      end
+      unless @password
+        raise ArgumentError.new("password required")
+      end
+      @script_path = params[:script_path] || "./script/ymdt"
+    end
+    
+    def put(params={})
+      invoke(:put, params)
+    end
+    
+    def get(params={})
+      invoke(:get, params)
+    end
+    
+    def create(params={})
+      raise ArgumentError.new("application_id required") unless params[:application_id]
+      invoke(:get, params)
+    end
+    
+    def ls(params={})
+      invoke(:ls, {:return => true}.merge(params))
+    end
+    
+    def upgrade(params={})
+      invoke(:upgrade, params)
+    end
+  
+    # prepares the commands to correctly reference the application and path
+    #
+    def invoke(command, params={})
+      command_string = compile_command(command, params)
+      output_command(command_string)
+      execute(command_string, params)
+    end
+    
+    private
+    
+    def output_command(command_string)
+      $stdout.puts
+      $stdout.puts StringMasker.new(command_string, :username => username, :password => password).to_s
+    end
+    
+    def compile_command(command, params)
+      full_path = nil
+      
+      # construct relative path to the application's location in the servers directory
+      #
+      if params[:application]
+        full_path = "#{SERVERS_PATH}/" << params[:application]
+        full_path = full_path << "/" << params[:path] if params[:path]
+      end
+      
+      # construct command line 
+      #
+      options = []
+      
+      # execute script
+      #
+      options << script_path
+      
+      # command (:put, :get, etc)
+      #
+      options << command
+      
+      # path
+      #
+      options << "\"#{full_path}\"" if full_path
+      
+      # optional sync flag MUST BE PLACED HERE
+      #
+      options << "-s" if params[:sync]
+      
+      # optional application ID flag
+      #
+      options << "-a#{params[:application_id]}" if params[:application_id]
+      
+      # username and password
+      
+      options << "-u#{username}"
+      options << "-p#{password}"
+      
+      options.join(" ") 
+    end
+    
+    # execute the command, or not, and return the results, or not
+    #
+    def execute(command, params={})
+      unless params[:dry_run]
+        if params[:return]
+          System.execute(command, :return => true)
+        else
+          $stdout.puts
+          System.execute(command)
+        end
+      end
+    end
+  end
+end

data/lib/ymdp/support/string_masker.rb

@@ -0,0 +1,17 @@
+class StringMasker
+  attr_accessor :string, :params, :output_string
+  
+  def initialize(string, params)
+    output_string = string.dup
+    
+    params.each do |key, value|
+      output_string.gsub!(value, "[#{key}]")
+    end
+    
+    @output_string = output_string
+  end
+  
+  def to_s
+    output_string
+  end
+end

data/lib/ymdp/tasks/ymdp.rake

@@ -1,3 +1,5 @@
+require 'deploy/ymdt'
+
 include YMDP::Config
 
 begin
@@ -157,12 +159,6 @@ DOCS
   puts docs
 end
 
-def time(message="")
-  Timer.new(:title => "YMDP").time(message) do
-    yield
-  end
-end
-
 desc "Deploys application to YMDP servers"
 task :deploy do
   time("Deployed #{@application}: #{@path}") do
@@ -478,46 +474,17 @@ end
 
 # END OF RAKE TASKS
 
-def invoke_ymdt(command_string, application, path="", return_results=false)
-  dir = "./servers/" << application
-  path = dir << "/" << path
-    
-  command = []  
-  command << command_string
-  command << "\"#{path}\""
-  command << "-s" if @sync
-
-  ymdt_command(command, return_results)
+def time(message="")
+  Timer.new(:title => "YMDP", :growl => growl?).time(message) do
+    yield
+  end
 end
 
-def ymdt_command(commands, return_results=false)
-  command = []
-  # command << "php"
-  command << "./script/ymdt"
-  
-  command << commands
-  
-  command << "-u#{@username}"
-  command << "-p#{@password}"
-  command_string = command.join(" ")
-  
-  display_string = command_string.dup
-  display_string.gsub!(@username, "[username]")
-  display_string.gsub!(@password, "[password]")
-  
-  puts
-  puts display_string
-
-  unless @dry_run
-    if return_results
-      `#{command_string}`
-    else
-      puts
-      system command_string
-    end
-  end
+def ymdt
+  @ymdt ||= YMDT::Base.new(:username => @username, :password => @password)
 end
 
+
 def validated_embedded_js(path)
   # jslint only accepts files, later we can hack it to accept stdin pipes
   doc = open(path) { |f| 
@@ -542,7 +509,7 @@ def deploy(application, path)
   Rake::Task["validate:#{application}:javascripts"].invoke if validate_js_assets?
   Rake::Task["validate:#{application}:json"].invoke if validate_json_assets?
 
-  invoke_ymdt("put", application, path)
+  ymdt.put(:application => application, :path => path)
 end
 
 def deploy_path(application, path)
@@ -568,7 +535,7 @@ def deploy_path(application, path)
   
       if file =~ Regexp.new(path)
         puts file
-        invoke_ymdt("put", application, new_path)
+        ymdt.put(:application => application, :path => new_path)
       end
     end
   end
@@ -587,7 +554,7 @@ def deploy_yrb(application, path, options={})
 end
 
 def list(application, path)
-  invoke_ymdt("ls", application, path, true)
+  ymdt.ls(:application => application, :path => path, :return_results => true)
 end
 
 def check_asset_ids(application, path)
@@ -687,22 +654,7 @@ def create_directory_from_application(application, path="")
   time("Done creating #{application}: #{path}") do
     puts "Creating #{application}: #{path}"
     application_id = SERVERS[application]["application_id"]
-  
-    dir = "./servers/#{application}"
-  
-    if path == ""
-      path = dir
-    else
-      path = "./" << path
-    end
-  
-    command = []
-  
-    command << "get"
-    command << path
-    command << "-a#{application_id}"
-  
-    ymdt_command(command)
+    ymdt.get(:application => application, :path => path, :application_id => application_id)
   end  
 end
 

data/lib/ymdp/translator/base.rb

@@ -91,9 +91,6 @@ module YMDP
     # Finds English language translation keys which have not been translated 
     # and translates them through Google Translate.
     #
-    # Usage: 
-    #   YMDP::Translator::Base.new().translate
-    #
     class Base
       include YMDP::FileSupport
       extend YMDP::FileSupport
@@ -303,6 +300,9 @@ module YMDP
       end    
     end
     
+    # Usage: 
+    #   YMDP::Translator::Yaml.new().translate
+    #
     class Yaml < Base
       include YMDP::Yaml::Support
       extend YMDP::Yaml::Support
@@ -340,6 +340,9 @@ module YMDP
       end
     end
     
+    # Usage: 
+    #   YMDP::Translator::YRB.new().translate
+    #
     class YRB < Base
       include YMDP::YRB::Support
       extend YMDP::YRB::Support

data/lib/ymdp.rb

@@ -7,6 +7,9 @@ $LOAD_PATH.unshift dir unless $LOAD_PATH.include?(dir)
 # load application
 #
 
+require 'erb'
+require 'set'
+
 require File.expand_path("#{dir}/tag_helper")
 require File.expand_path("#{dir}/asset_tag_helper")
 

data/spec/data/Rakefile

@@ -0,0 +1,3 @@
+Dir["./lib/tasks/*.rake"].each do |file|
+  load file
+end

data/spec/data/VERSION

@@ -0,0 +1 @@
+6.0.0 Felucia

data/spec/data/app/.gitignore

@@ -0,0 +1 @@
+assets.zip