daddy 0.0.18 → 0.0.19

data/lib/daddy/capistrano/remote_cache_subdir.rb

@@ -0,0 +1,32 @@
+# coding: UTF-8
+
+require 'capistrano/recipes/deploy/strategy/remote_cache'
+
+module Daddy
+  module Capistrano
+    class RemoteCacheSubdir < ::Capistrano::Deploy::Strategy::RemoteCache
+    
+      private
+    
+      def repository_cache_subdir
+        if configuration[:deploy_subdir]
+          File.join(repository_cache, configuration[:deploy_subdir])
+        else
+          repository_cache
+        end
+      end
+    
+      def copy_repository_cache
+        logger.trace "copying the cached version to #{configuration[:release_path]}"
+        if copy_exclude.empty? 
+          run "cp -RPp #{repository_cache_subdir} #{configuration[:release_path]} && #{mark}"
+        else
+          exclusions = copy_exclude.map { |e| "--exclude=\"#{e}\"" }.join(' ')
+          run "rsync -lrpt #{exclusions} #{repository_cache_subdir}/* #{configuration[:release_path]} && #{mark}"
+        end
+      end
+    
+    end
+  end
+end
+

data/lib/daddy/cucumber/diff.rb

@@ -4,32 +4,59 @@ module Daddy
   module Cucumber
     module Diff
       
-      def git_diff(local_file, git_path)
+      def git_diff(local_file, git_path = nil)
         git = Daddy::Git.new
+        git_path ||= local_file 
+
         a = File.read(local_file).gsub(/[<>]/, '<' => '&lt;', '>' => '&gt;')
         b = git.show_previous(git_path, true).gsub(/[<>]/, '<' => '&lt;', '>' => '&gt;')
-        diff = Differ.diff(a, b)
+        diff = format_diff(Differ.diff(a, b))
 
-        diff_lines = diff.to_s.split("\n")
+        puts local_file
+        puts "<pre>#{diff}</pre>"
+      end
+      
+      def git_diff_name(*includes)
+        git = Daddy::Git.new
+        puts '<pre>' + git.git_diff_name(*includes) + '</pre>'
+      end
+      
+      def diff(file_a, file_b)
+        a = File.read(file_a)
+        b = File.read(file_b)
+        diff = format_diff(Differ.diff(a, b))
+
+        puts file_a
+        puts "<pre>#{diff}</pre>"
+      end
+
+      def show(file)
+        puts file
+        puts "<pre>#{File.read(file).gsub(/[<>]/, '<' => '&lt;', '>' => '&gt;')}</pre>"
+      end
+      
+      private
+      
+      def format_diff(diff)
         lines = []
-        puts diff_lines.size
+
+        diff_lines = diff.to_s.split("\n")
         diff_lines.each_with_index do |line, i|
-          if line.index('<ins ') and line.index('<del ')
-            split = line.split('<ins ')
+          if line.index('</del><ins class="differ">') 
+            split = line.split('</del><ins class="differ">')
             lines << split[0]
-            lines << '<ins ' + split[1]
+            if split[1].start_with?('"')
+              lines << '</del><ins class="differ">"'
+              lines << split[1][1..-1]
+            else
+              lines << '</del><ins class="differ">' + split[1]
+            end
           else
             lines << line
           end
         end
-
-        puts local_file
-        puts "<pre>#{lines.join("\n")}</pre>"
-      end
-
-      def show(file)
-        puts file
-        puts "<pre>#{File.read(file).gsub(/[<>]/, '<' => '&lt;', '>' => '&gt;')}</pre>"
+        
+        lines.join("\n")
       end
 
     end

data/lib/daddy/formatter/daddy.css

@@ -62,7 +62,7 @@
   border-bottom: 1px solid #999999;
   background: #F0F8FF;
   color: #001111;
-  margin-left: 10px;
+  margin-left: 15px;
 }
 
 .feature_dir {

data/lib/daddy/formatter/html.rb

@@ -161,9 +161,9 @@ module Daddy
         end
 
         lines = name.split(/\r?\n/)
-        unless lines.empty?
+        if lines.size > 1
           @builder.p(:class => 'narrative') do
-            lines.each do |line|
+            lines[1..-1].each do |line|
               @builder.text!(line.strip)
               @builder.br
             end

data/lib/daddy/git.rb

@@ -7,6 +7,12 @@ end
 module Daddy
   
   class Git
+    @@sub_dir = nil
+
+    def self.sub_dir=(sub_dir)
+      @@sub_dir = sub_dir
+    end
+    
     def branches(remote = false)
       branches = []
       `git branch -a`.split("\n").each do |b|
@@ -54,7 +60,32 @@ module Daddy
     end
     
     def show_previous(file, remote = false)
-      `git show #{previous_branch(remote)}:#{file}`
+      if @@sub_dir
+        sub_dir = @@sub_dir
+        sub_dir += '/' unless @@sub_dir.end_with?('/')
+        `git show #{previous_branch(remote)}:#{sub_dir}#{file}`
+      else
+        `git show #{previous_branch(remote)}:#{file}`
+      end
+    end
+
+    def git_diff_name(*includes)
+      diff = `git diff origin/#{previous_branch} --name-only #{includes.join(' ')}`
+      return diff unless @@sub_dir
+
+      ret = []
+      diff.split("\n").each do |line|
+        index = line.index(@@sub_dir)
+        if index
+          sub_file = line[@@sub_dir.length..-1]
+          sub_file = sub_file[1..-1] if sub_file.start_with?('/')
+          ret << sub_file
+        else
+          ret << line
+        end
+      end
+
+      ret.join("\n")
     end
   end
 

data/lib/daddy/railtie.rb

@@ -2,7 +2,6 @@
 
 require 'rails'
 require 'rails_i18n'
-require 'devise'
 
 if ENV["COVERAGE"]
   require 'simplecov'

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: daddy
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.19
+  prerelease: 
 platform: ruby
 authors:
 - ichy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-24 00:00:00.000000000 Z
+date: 2013-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara-webkit
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber-rails
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -69,6 +78,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: ci_reporter
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -76,20 +86,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: devise
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -97,6 +94,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: differ
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -104,6 +102,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -111,6 +110,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -118,6 +118,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -125,6 +126,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rails-i18n
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -132,6 +134,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -139,6 +142,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -146,6 +150,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -153,6 +158,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov-rcov
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -160,6 +166,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -171,58 +178,60 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/daddy.rb
-- lib/daddy/cucumber.rb
-- lib/daddy/cucumber/pause.rb
-- lib/daddy/cucumber/capture.rb
-- lib/daddy/cucumber/html.rb
-- lib/daddy/cucumber/step_definitions/common.rb
-- lib/daddy/cucumber/assert.rb
-- lib/daddy/cucumber/table.rb
-- lib/daddy/cucumber/diff.rb
-- lib/daddy/git.rb
-- lib/daddy/formatter/menu.html.erb
-- lib/daddy/formatter/html.rb
-- lib/daddy/formatter/daddy_html.rb
-- lib/daddy/formatter/daddy.css
-- lib/daddy/formatter/cucumber.css
-- lib/daddy/formatter/jquery-min.js
-- lib/daddy/railtie.rb
-- lib/tasks/jenkins
-- lib/tasks/jenkins.rake
 - lib/tasks/dad.rake
 - lib/tasks/db_config.rake
-- lib/tasks/publish.rake
-- lib/tasks/cucumber_steps.rake
-- lib/tasks/jenkins_install.sh
+- lib/tasks/jenkins
 - lib/tasks/cucumber.rake
 - lib/tasks/jenkins.conf
 - lib/tasks/cucumber_install.rake
-- lib/tasks/diary.rake
-- lib/tasks/db_create.rake
-- lib/tasks/test.rake
 - lib/tasks/database.yml.erb
+- lib/tasks/test.rake
+- lib/tasks/db_create.rake
+- lib/tasks/jenkins_install.sh
+- lib/tasks/publish.rake
+- lib/tasks/jenkins.rake
+- lib/tasks/cucumber_steps.rake
+- lib/tasks/diary.rake
+- lib/daddy/railtie.rb
+- lib/daddy/cucumber/diff.rb
+- lib/daddy/cucumber/html.rb
+- lib/daddy/cucumber/capture.rb
+- lib/daddy/cucumber/assert.rb
+- lib/daddy/cucumber/pause.rb
+- lib/daddy/cucumber/step_definitions/common.rb
+- lib/daddy/cucumber/table.rb
+- lib/daddy/formatter/cucumber.css
+- lib/daddy/formatter/html.rb
+- lib/daddy/formatter/daddy.css
+- lib/daddy/formatter/menu.html.erb
+- lib/daddy/formatter/daddy_html.rb
+- lib/daddy/formatter/jquery-min.js
+- lib/daddy/git.rb
+- lib/daddy/capistrano/remote_cache_subdir.rb
+- lib/daddy/cucumber.rb
+- lib/daddy.rb
 homepage: https://github.com/ichylinux/daddy
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.24
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: My rails dad
 test_files: []

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ODU2YzdmNDk5ZWFhYzlmZWIzODgzY2I5YzM4NjgyM2QyYTlhMmI3OQ==
-  data.tar.gz: !binary |-
-    MDRkYmE3M2YzOWQ5NTBkNzYzYzBlMDE3ZTZlYzgzMmYxOGI3YTNmMw==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    ZDdhYWE2NWZkZTc3ZWQxOThiOWZiM2VlMTA1MTM3OThlM2Q4MjFhZmI1NmU4
-    ZjM5YjliZTdjZTU2ZDg0NWViMGU1NWE0ZTM2ZTViMDZiYjRlYTlkZDk2M2Zi
-    ODIyMzQzYWQ1Y2FhYWJiZTgwNjUzOWUzN2QzNDE0MmZhZDg0ZWQ=
-  data.tar.gz: !binary |-
-    MTc4YTg3MDc4NmMwOTRkMDczMzA3MzUwMjZiYzVmYTFmZTc5Mzg5YzJkY2Jl
-    YWEzNjQwYWQ2Mzg3OTlhYTEyYWVhMjhhZGNjODBhNmVlNmQ5NzA5ZjIwNmVl
-    YWEwNWMwYTgyZDUxNzNjYjRlMjBiNjRiMjA1ODdjZjVhNzczYzE=