daddy 0.0.22 → 0.1.0

data/lib/daddy/cucumber/diff.rb

@@ -5,6 +5,8 @@ module Daddy
     module Diff
       
       def git_diff(file, options = {})
+        options[:as] ||= 'edit'
+        
         git = Daddy::Git.new
         a = File.read(file).gsub(/[<>]/, '<' => '&lt;', '>' => '&gt;')
         b = git.show_previous(file, true).gsub(/[<>]/, '<' => '&lt;', '>' => '&gt;')
@@ -19,12 +21,12 @@ module Daddy
         puts '<pre>' + git.git_diff_name(*includes) + '</pre>'
       end
       
-      def diff(file_a, file_b)
+      def diff(file_a, file_b, options = {})
         a = File.read(file_a)
         b = File.read(file_b)
         diff = format_diff(Differ.diff(a, b))
 
-        puts file_a
+        show_filename(file_a, options)
         puts "<pre>#{diff}</pre>"
       end
 
@@ -38,6 +40,10 @@ module Daddy
       def show_filename(filename, options = {})
         if options[:as] == 'new'
           puts "<span class=\"new\">[新規作成] #{filename}</span>"
+        elsif options[:as] == 'auto'
+          puts "<span class=\"auto\">[自動生成] #{filename}</span>"
+        elsif options[:as] == 'edit'
+          puts "<span class=\"edit\">[編集] #{filename}</span>"
         else
           puts filename
         end

data/lib/daddy/formatter/daddy.css

@@ -120,6 +120,16 @@ span.new {
   font-weight: bold;
 }
 
+span.edit {
+  color: #006400;
+  font-weight: bold;
+}
+
+span.auto {
+  color: #006400;
+  font-weight: bold;
+}
+
 ins.differ {
   text-decoration: none;
   background: #90EE90;

data/lib/tasks/dad.rake

@@ -5,3 +5,9 @@ require 'rake'
 task :dad do
   system('rake -T | grep dad:')
 end
+
+namespace :dad do
+  task :install do
+    system('rake dad:cucumber:install')
+  end
+end

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: daddy
 version: !ruby/object:Gem::Version
-  version: 0.0.22
+  version: 0.1.0
+  prerelease: 
 platform: ruby
 authors:
 - ichy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-05 00:00:00.000000000 Z
+date: 2013-05-21 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,6 +86,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -83,6 +94,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: differ
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -90,6 +102,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -97,6 +110,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: poltergeist
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -104,6 +118,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -111,6 +126,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -118,6 +134,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -125,6 +142,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rails-i18n
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -132,6 +150,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -139,6 +158,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -146,6 +166,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -153,6 +174,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov-rcov
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -160,6 +182,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -171,70 +194,71 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/daddy.rb
-- lib/daddy/cucumber.rb
-- lib/daddy/cucumber/pause.rb
-- lib/daddy/cucumber/capture.rb
+- lib/tasks/dad.rake
+- lib/tasks/db_config.rake
+- lib/tasks/unicorn.erb
+- lib/tasks/jenkins
+- lib/tasks/nginx.rake
+- lib/tasks/cucumber.rake
+- lib/tasks/jenkins.conf
+- lib/tasks/unicorn.rb
+- lib/tasks/cucumber_install.rake
+- lib/tasks/database.yml.erb
+- lib/tasks/nginx.repo
+- lib/tasks/phantomjs.rake
+- lib/tasks/test.rake
+- lib/tasks/nginx.conf.erb
+- 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/unicorn.rake
+- lib/tasks/diary.rake
+- lib/daddy/railtie.rb
+- lib/daddy/cucumber/diff.rb
 - lib/daddy/cucumber/html.rb
-- lib/daddy/cucumber/step_definitions/common.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/cucumber/diff.rb
-- lib/daddy/helpers/html_helper.rb
-- lib/daddy/capistrano/remote_cache_subdir.rb
-- lib/daddy/git.rb
-- lib/daddy/model.rb
-- lib/daddy/formatter/menu.html.erb
+- lib/daddy/formatter/cucumber.css
 - lib/daddy/formatter/html.rb
-- lib/daddy/formatter/daddy_html.rb
 - lib/daddy/formatter/daddy.css
-- lib/daddy/formatter/cucumber.css
+- lib/daddy/formatter/menu.html.erb
+- lib/daddy/formatter/daddy_html.rb
 - lib/daddy/formatter/jquery-min.js
-- lib/daddy/railtie.rb
 - lib/daddy/models/acts_as_like.rb
+- lib/daddy/git.rb
+- lib/daddy/capistrano/remote_cache_subdir.rb
+- lib/daddy/helpers/html_helper.rb
 - lib/daddy/utils/sql_utils.rb
-- lib/tasks/jenkins
-- lib/tasks/nginx.repo
-- lib/tasks/unicorn.rb
-- 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/cucumber.rake
-- lib/tasks/nginx.rake
-- lib/tasks/jenkins.conf
-- lib/tasks/cucumber_install.rake
-- lib/tasks/unicorn.rake
-- lib/tasks/diary.rake
-- lib/tasks/db_create.rake
-- lib/tasks/unicorn.erb
-- lib/tasks/test.rake
-- lib/tasks/phantomjs.rake
-- lib/tasks/database.yml.erb
-- lib/tasks/nginx.conf.erb
+- lib/daddy/model.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 |-
-    ZDk2Mjg3NzBlMzkzN2U4ZDI5OTNhOWE5MzU1YTI4NDM3YjYxMmJiNQ==
-  data.tar.gz: !binary |-
-    ZmI0N2RjMTgxZjNiYmZmMjYwMDFhNGI4MTFhY2VlOGMwNDA3ZWVlMQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    MWZmODNhMWVlODE3MDhhYTY0OTc3MTIxNmM3YzcxOWRlY2YyMDdhN2IzMzZh
-    NTk5MjkzYzExNzU5MjA4OWMwZDg0NWVmOWE1MGJmNzY3OTQ4MWQ1YjNjNmFm
-    ZDc2MWMxMDIzODg1ZGEwNjY3ODFkYWY4Y2Y1NDRlMTJhYjUxNjI=
-  data.tar.gz: !binary |-
-    ZWRkYmExNDc3ZDlkNWY1YjNlZjljYjgzYjQ3NTIzYTdjODI2NzZkZDJmOGNj
-    MzgyYjAzNmVlNmY1OTMyZDZhYzRkMjk1ZjM5YTVmNGMzOTI1YTEzYWE3NTM2
-    NGE3ODMyMWIwOGFlYTBjY2RkZjZjZjYzNDMxZmNjOTM5YzgwNTc=