daddy 0.1.18 → 0.1.20

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NTMzNjJlOTUzYzJjOTg2MTEzMjM3YTcwYzA1OGU2ODYzMTVmZWE0OA==
+  data.tar.gz: !binary |-
+    ZjAzMDk4MWZjYzQ1MzQyNzZmYzY5NmIyNGExM2NkMjVhZjBhZmFkMA==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    ZTgxZTYzYmJjOWVkYmFhZmFmNzUzMzlhODFhNDY0Yjg3Mzg1ZDNiNzhmM2Jl
+    OTliNjc0YTY3ZGJlNGUwMTEzMTZkZGM3YmVlMGM2ODY3NmNhZDVlODM5MzM5
+    MzI5MjBmNTljZmIzODQwMjVmZmRkODY0ZGEwZWU3NTIwNWM3ZTU=
+  data.tar.gz: !binary |-
+    NGFiY2ZhMzY3M2RmZDlkYWU1ODcxMjgyNmM4ODU5ZTQ5ZmI5ZTc0ZGRiZmNh
+    NzU1Y2ZkMWY2N2Y0OWNlYTg3NWRjYmFkM2U0YTU3NzRiMWNkZTVhOGE5YWYz
+    MWJhZDVlMDZlMzk5MTdjYjRhOGYzNDJhZTI4MmMzNmI4MDk3YTY=

data/lib/daddy/cucumber/diff.rb

@@ -5,11 +5,25 @@ module Daddy
     module Diff
       
       def git_diff(file, options = {})
-        options[:as] ||= 'edit'
+        options[:as] = 'edit' unless options.has_key?(:as)
+        remote = options.has_key?(:remote) ? options[:remote] : true 
 
         git = Daddy::Git.new
-        a = File.read(file).gsub(/[<>]/, '<' => '&lt;', '>' => '&gt;')
-        b = git.show_previous(file, true).gsub(/[<>]/, '<' => '&lt;', '>' => '&gt;')
+        
+        if options[:between]
+          a = git.show_previous(file, :commit => options[:between], :remote => remote)
+        else
+          a = File.read(file)
+        end
+        a = a.gsub(/[<>]/, '<' => '&lt;', '>' => '&gt;')
+
+        if options[:and]
+          b = git.show_previous(file, :commit => options[:and], :remote => remote)
+        else
+          b = git.show_previous(file, :remote => remote)
+        end
+        b = b.gsub(/[<>]/, '<' => '&lt;', '>' => '&gt;')
+
         diff = format_diff(Differ.diff(a, b), options)
 
         show_filename(file, options)
@@ -22,8 +36,8 @@ module Daddy
       end
       
       def diff(file_a, file_b, options = {})
-        a = File.read(file_a)
-        b = File.read(file_b)
+        a = File.read(file_a).gsub(/[<>]/, '<' => '&lt;', '>' => '&gt;')
+        b = File.read(file_b).gsub(/[<>]/, '<' => '&lt;', '>' => '&gt;')
         diff = format_diff(Differ.diff(a, b))
 
         show_filename(file_a, options)

data/lib/daddy/formatter/daddy.css

@@ -63,8 +63,8 @@
   border-bottom: 1px solid #999999;
   background: #F0F8FF;
   color: #001111;
-  margin-left: 15px;
-  padding-right: 15px;
+  margin: 5px 0px 5px 15px;
+  padding: 3px 15px 3px 10px;
 }
 
 .feature_dir {
@@ -110,6 +110,18 @@ div.scenario {
   margin: 10px 10px 10px 20px;
 }
 
+div.scenario.faild h3,
+div.scenario.faild .scenario_file {
+  background: #C40D0D;
+  color: #FFFFFF;
+}
+
+div.scenario.pending h3,
+div.scenario.pending .scenario_file {
+  background: #FAF834;
+  color: #000000;
+}
+
 div.scenario ol {
   margin-left: 20px;
 }
@@ -123,6 +135,17 @@ div.scenario td {
   padding: 5px;
 }
 
+span.feature_subtitle {
+  margin-left: 20px;
+  color: #999999;
+  font-size: 0.9em;
+}
+
+span.scenario_file {
+  padding: 3px;
+  line-height: 1.2em;
+}
+
 span.new {
   color: #006400;
   font-weight: bold;

data/lib/daddy/formatter/daddy_html.rb

@@ -38,10 +38,6 @@ module Daddy
         @feature.file.gsub(/(\/|\.|\\)/, '_')
       end
 
-      def scenario_id
-        feature_id + '_scenario_' + @scenario_number.to_s
-      end
-
       def feature_dir(feature, short = false)
         ret = ''
         

data/lib/daddy/formatter/html.rb

@@ -22,11 +22,9 @@ module Daddy
         @buffer = {}
         @builder = create_builder(@io)
         @feature_number = 0
-        @scenario_number = 0
         @step_number = 0
         @header_red = nil
         @delayed_messages = []
-        @img_id = 0
         @inside_outline = false
       end
 
@@ -121,7 +119,12 @@ module Daddy
         title = feature_dir(@feature, true) + @feature.file.split('/').last.gsub(/\.feature/, '')
 
         @builder.h2 do |h2|
-          @builder.span(title, :class => 'val')
+          @builder.span(:class => 'val') do
+            @builder << title
+            unless name.strip.blank?
+              @builder.span('(' + name.strip + ')', :class => 'feature_subtitle')
+            end
+          end
         end
 
         lines = name.split(/\r?\n/)
@@ -147,7 +150,7 @@ module Daddy
 
       def background_name(keyword, name, file_colon_line, source_indent)
         @listing_background = true
-        @builder.h3(:id => scenario_id) do |h3|
+        @builder.h3 do |h3|
           @builder.span(keyword, :class => 'keyword')
           @builder.text!(' ')
           @builder.span(name, :class => 'val')
@@ -155,7 +158,6 @@ module Daddy
       end
 
       def before_feature_element(feature_element)
-        @scenario_number+=1
         @scenario_red = false
         css_class = {
           ::Cucumber::Ast::Scenario        => 'scenario',
@@ -178,7 +180,7 @@ module Daddy
         @listing_background = false
 
         lines = name.split("\n")
-        @builder.h3(:id => scenario_id) do
+        @builder.h3 do
           @builder.span(lines[0], :class => 'val')
         end
         
@@ -234,7 +236,6 @@ module Daddy
       end
 
       def before_step(step)
-        @step_id = step.dom_id + '_' + Daddy::Utils::StringUtils.current_time
         @step_number += 1
         @step = step
       end
@@ -262,9 +263,9 @@ module Daddy
         set_scenario_color(status)
 
         if ! @delayed_messages.empty? and status == :passed
-          @builder << "<li id='#{@step_id}' class='step #{status} expand'>"
+          @builder << "<li class='step #{status} expand'>"
         else
-          @builder << "<li id='#{@step_id}' class='step #{status}'>"
+          @builder << "<li class='step #{status}'>"
         end
       end
 
@@ -397,17 +398,10 @@ module Daddy
 
         #@builder.ol do
           @delayed_messages.each_with_index do |ann, i|
-            @builder.li(:id => "#{@step_id}_#{i}", :class => 'step message', :style => 'display: none;') do
+            @builder.li(:class => 'message', :style => 'display: none;') do
               @builder << ann
             end
           end
-          @builder.script do |script|
-            script << "$(function() {"
-            script << "  $('##{@step_id}').css('cursor', 'pointer').click(function() {"
-            script << "    $(this).nextAll('li[id^=\"#{@step_id}_\"]').toggle(250);"
-            script << "  });"
-            script << "});"
-          end
         #end
         empty_messages
       end
@@ -461,18 +455,26 @@ module Daddy
       end
 
       def set_scenario_color_failed
+        id = Daddy::Utils::StringUtils.current_time
+        style = 'display: none; margin: 0; padding: 0;'
+        @builder << "<div id=\"#{id}\" style=\"#{style}\"></div>"
+
         @builder.script do
           @builder.text!("makeRed('cucumber-header');") unless @header_red
           @header_red = true
-          @builder.text!("makeRed('#{scenario_id}');") unless @scenario_red
+          @builder.text!("$(function() { $('##{id}').closest('.scenario').addClass('faild'); });") unless @scenario_red
           @scenario_red = true
         end
       end
 
       def set_scenario_color_pending
+        id = Daddy::Utils::StringUtils.current_time
+        style = 'display: none; margin: 0; padding: 0;'
+        @builder << "<div id=\"#{id}\" style=\"#{style}\"></div>"
+
         @builder.script do
           @builder.text!("makeYellow('cucumber-header');") unless @header_red
-          @builder.text!("makeYellow('#{scenario_id}');") unless @scenario_red
+          @builder.text!("$(function() { $('##{id}').closest('.scenario').addClass('pending'); });") unless @scenario_red
         end
       end
 
@@ -546,12 +548,25 @@ module Daddy
       def inline_daddy
         ret = File.read(File.dirname(__FILE__) + '/daddy.js')
 
+        ret << %w{
+          $(document).ready(function() {
+            $('li.step').each(function() {
+              var messages = $(this).nextUntil('li.step').filter('.message');
+              if (messages.length > 0) {
+                $(this).css('cursor', 'pointer').click(function() {
+                  messages.toggle(250);
+                });
+              }
+            });
+          });
+        }.join(' ')
+
         if should_expand
           ret << %w{
             $(document).ready(function() {
               $('#expander').click();
-              });
-          }.join
+            });
+          }.join(' ')
         end
         
         ret
@@ -580,9 +595,6 @@ module Daddy
     });
   });
 
-  function moveProgressBar(percentDone) {
-    $("cucumber-header").css('width', percentDone +"%");
-  }
   function makeRed(element_id) {
     $('#'+element_id).css('background', '#C40D0D');
     $('#'+element_id).css('color', '#FFFFFF');
@@ -596,7 +608,6 @@ module Daddy
       end
 
       def move_progress
-        @builder << " <script type=\"text/javascript\">moveProgressBar('#{percent_done}');</script>"
       end
 
       def percent_done

data/lib/daddy/git.rb

@@ -1,17 +1,8 @@
 # coding: UTF-8
 
-Dir::glob(File.dirname(__FILE__) + '/git/*.rb').each do |file|
-  require file
-end
-
 module Daddy
   
   class Git
-    @@sub_dir = nil
-
-    def self.sub_dir=(sub_dir)
-      @@sub_dir = sub_dir
-    end
 
     def branches(remote = false)
       branches = []
@@ -63,33 +54,19 @@ module Daddy
       end
     end
     
-    def show_previous(file, remote = false)
-      if @@sub_dir
-        sub_dir = @@sub_dir
-        sub_dir += '/' unless @@sub_dir.end_with?('/')
-        `git show #{previous_branch(remote)}:#{sub_dir}#{file}`
+    def show_previous(file, options = {})
+      remote = options[:remote]
+      commit = options[:commit]
+
+      if commit
+        `git show #{commit}:#{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")
+      `git diff origin/#{previous_branch} --name-only #{includes.join(' ')}`
     end
   end
 

data/lib/daddy/railtie.rb

@@ -1,6 +1,7 @@
 # coding: UTF-8
 
 require 'rails_i18n'
+require 'holiday_jp'
 
 if ENV["COVERAGE"].to_s.downcase == 'true'
   require 'simplecov'
@@ -37,7 +38,7 @@ module Daddy
 
     rake_tasks do
       lib = File.dirname(File.dirname(__FILE__))
-      Dir[File.join(lib, 'tasks/*.rake')].each do |f|
+      Dir[File.join(lib, 'tasks/**/*.rake')].each do |f|
         load f
       end
     end

data/lib/tasks/generate/controller.rake

@@ -0,0 +1,29 @@
+# coding: UTF-8
+
+require 'rake'
+require 'erb'
+
+namespace :dad do
+  namespace :generate do
+
+    task :controller => :environment do
+      ARGV[1..-1].each do |arg|
+        unless arg.index('=')
+          task arg.to_sym do ; end
+          
+          if @resources.nil?
+            @resources = arg.downcase
+          end
+        end
+      end
+
+      @resource = @resources.singularize
+      @model_class = @resource.capitalize.constantize
+
+      template = File.join(File.dirname(__FILE__), 'templates', 'controller.rb.erb')
+      controller_file = "#{Rails.root}/app/controllers/#{@resources}_controller.rb"
+      File.write(controller_file, ERB.new(File.read(template)).result)
+    end
+    
+  end
+end

data/lib/tasks/generate/templates/_form.html.erb

@@ -0,0 +1,12 @@
+<%= @tag_begin %>= form_for @<%= @resources.singularize %> do |f| <%= @tag_end %>
+  <table>
+<% @model_class.columns.each do |column| -%>
+<% next if %w{ id deleted created_at updated_at }.include?(column.name.to_s) -%>
+    <tr>
+      <th><%= @tag_begin %>= f.label :<%= column.name %> <%= @tag_end %></th>
+      <td><%= @tag_begin %>= f.text_field :<%= column.name %> <%= @tag_end %></td>
+    </tr>
+<% end -%>
+  </table>
+  <%= @tag_begin %>= f.submit <%= @tag_end %>
+<%= @tag_begin %> end <%= @tag_end %>

data/lib/tasks/generate/templates/controller.rb.erb

@@ -0,0 +1,62 @@
+# coding: UTF-8
+
+class <%= @resources.capitalize %>Controller < ApplicationController
+
+  def index
+    @<%= @resources %> = <%= @model_class %>.not_deleted
+  end
+
+  def show
+    @<%= @resource %> = <%= @model_class.name %>.find(params[:id])
+  end
+
+  def new
+    @<%= @resource %> = <%= @model_class.name %>.new
+  end
+
+  def create
+    @<%= @resource %> = <%= @model_class.name %>.new(params[:<%= @resource %>])
+    
+    begin
+      @<%= @resource %>.transaction do
+        @<%= @resource %>.save!
+      end
+
+      redirect_to :action => 'show', :id => @<%= @resource %>.id
+
+    rescue ActiveRecord::RecordInvalid => e
+      render :new
+    end
+  end
+
+  def edit
+    @<%= @resource %> = <%= @model_class.name %>.find(params[:id])
+  end
+
+  def update
+    @<%= @resource %> = <%= @model_class.name %>.find(params[:id])
+    
+    begin
+      @<%= @resource %>.transaction do
+        @<%= @resource %>.attributes = params[:<%= @resource %>]
+        @<%= @resource %>.save!
+      end
+
+      redirect_to :action => 'show', :id => @<%= @resource %>.id
+
+    rescue ActiveRecord::RecordInvalid => e
+      render :edit
+    end
+  end
+
+  def destroy
+    @<%= @resource %> = <%= @model_class.name %>.find(params[:id])
+    
+    @<%= @resource %>.transaction do
+      @<%= @resource %>.destroy_logically!
+    end
+    
+    redirect_to :action => 'index'
+  end
+
+end

data/lib/tasks/generate/templates/edit.html.erb

@@ -0,0 +1,6 @@
+<div class="actions">
+  <%= @tag_begin %>= link_to '一覧', <%= @resources %>_path <%= @tag_end %>
+  <%= @tag_begin %>= link_to '参照', <%= @resource %>_path(@<%= @resource %>) <%= @tag_end %>
+</div>
+
+<%= @tag_begin %>= render 'form' <%= @tag_end %>

data/lib/tasks/generate/templates/index.html.erb

@@ -0,0 +1,28 @@
+<div class="actions">
+  <%= @tag_begin %>= link_to '追加', new_<%= @resource %>_path <%= @tag_end %>
+</div>
+
+<table>
+  <tr>
+<% @model_class.columns.each do |column| -%>
+<% next if %w{ id deleted created_at updated_at }.include?(column.name.to_s) -%>
+    <th><%= @tag_begin %>= <%= @model_class.name %>.human_attribute_name :<%= column.name %> <%= @tag_end %></th>
+<% end -%>
+    <th colspan="2"></th>
+  </tr>
+  
+  <%= @tag_begin %> @<%= @resources %>.each do |<%= @short_name %>| <%= @tag_end %>
+    <tr>
+<% @model_class.columns.each do |column| -%>
+<% next if %w{ id deleted created_at updated_at }.include?(column.name.to_s) -%>
+      <td><%= @tag_begin %>= <%= @short_name %>.<%= column.name %> <%= @tag_end %></td>
+<% end -%>
+      <td>
+        <%= @tag_begin %>= link_to '編集', edit_<%= @resource %>_path(<%= @short_name %>) <%= @tag_end %>
+      </td>
+      <td>
+        <%= @tag_begin %>= link_to '削除', <%= @resource %>_path(<%= @short_name %>), :method => 'delete', :confirm => '削除します。よろしいですか？' <%= @tag_end %>
+      </td>
+    </tr>
+  <%= @tag_begin %> end <%= @tag_end %>
+</table>

data/lib/tasks/generate/templates/new.html.erb

@@ -0,0 +1,5 @@
+<div class="actions">
+  <%= @tag_begin %>= link_to '一覧', <%= @resources %>_path <%= @tag_end %>
+</div>
+
+<%= @tag_begin %>= render 'form' <%= @tag_end %>

data/lib/tasks/generate/templates/show.html.erb

@@ -0,0 +1,15 @@
+<div class="actions">
+  <%= @tag_begin %>= link_to '一覧', <%= @resources %>_path <%= @tag_end %>
+  <%= @tag_begin %>= link_to '編集', edit_<%= @resource %>_path(@<%= @resource %>) <%= @tag_end %>
+  <%= @tag_begin %>= link_to '削除', <%= @resource %>_path(@<%= @resource %>), :method => 'delete', :confirm => '削除します。よろしいですか？' <%= @tag_end %>
+</div>
+
+<table>
+<% @model_class.columns.each do |column| -%>
+<% next if %w{ id deleted }.include?(column.name.to_s) -%>
+  <tr>
+    <th><%= @tag_begin %>= <%= @model_class %>.human_attribute_name :<%= column.name %> <%= @tag_end %></th>
+    <td><%= @tag_begin %>= @<%= @resource %>.<%= column.name %> <%= @tag_end %></td>
+  </tr>
+<% end -%>
+</table>

data/lib/tasks/generate/view.rake

@@ -0,0 +1,36 @@
+# coding: UTF-8
+
+require 'rake'
+require 'erb'
+
+namespace :dad do
+  namespace :generate do
+
+    task :view => :environment do
+      ARGV[1..-1].each do |arg|
+        unless arg.index('=')
+          task arg.to_sym do ; end
+          
+          if @resources.nil?
+            @resources = arg.downcase
+          end
+        end
+      end
+
+      @resource = @resources.singularize
+      @short_name = @resource.split('_').map(&:first).join
+      @model_class = @resource.capitalize.constantize
+      @tag_begin = '<%'
+      @tag_end = '%>'
+
+      Dir[File.join(File.dirname(__FILE__), 'templates/*.html.erb')].each do |template|
+        view_dir = "#{Rails.root}/app/views/#{@resources}"
+        FileUtils.mkdir_p(view_dir)
+
+        view_file = "#{view_dir}/#{File.basename(template)}"
+        File.write(view_file, ERB.new(File.read(template), 0, '-').result)
+      end
+    end
+    
+  end
+end

data/lib/tasks/nginx.app.conf.erb

@@ -11,6 +11,9 @@ server {
   
   location @app {
     proxy_pass http://<%= ENV['APP_NAME'] %>;
+    proxy_set_header Host $http_host;
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
   }
 
 <% if ENV['RAILS_ENV'] == 'production' %>

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: daddy
 version: !ruby/object:Gem::Version
-  version: 0.1.18
-  prerelease: 
+  version: 0.1.20
 platform: ruby
 authors:
 - ichy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-09 00:00:00.000000000 Z
+date: 2013-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: ci_reporter
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: differ
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -110,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -126,7 +111,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -134,7 +118,20 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: holiday_jp
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -142,7 +139,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: poltergeist
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -150,7 +146,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -158,7 +153,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -166,7 +160,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -174,7 +167,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rails-i18n
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -182,7 +174,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -190,7 +181,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -198,7 +188,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -206,7 +195,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -214,7 +202,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -222,7 +209,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov-rcov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -230,7 +216,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -238,7 +223,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -246,7 +230,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -254,7 +237,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rails-csv-fixtures
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -262,7 +244,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -273,90 +254,97 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/ssl/cert.pem
-- lib/tasks/dad.rake
-- lib/tasks/tesseract.rake
-- lib/tasks/db_config.rake
-- lib/tasks/nginx.app.conf.erb
-- lib/tasks/unicorn.erb
-- lib/tasks/jenkins
-- lib/tasks/nginx.rake
-- lib/tasks/db_fixtures.rake
-- lib/tasks/cucumber.rake
-- lib/tasks/jenkins.conf
-- 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/nginx.jenkins.conf.erb
-- lib/tasks/publish.rake
-- lib/tasks/jenkins.rake
-- lib/tasks/cucumber_steps.rake
-- lib/tasks/unicorn.rake
-- lib/tasks/diary.rake
-- lib/tasks/unicorn.rb.erb
-- lib/daddy/ocr.rb
-- lib/daddy/railtie.rb
-- lib/daddy/cucumber/diff.rb
-- lib/daddy/cucumber/html.rb
-- lib/daddy/cucumber/capture.rb
+- lib/daddy.rb
+- lib/daddy/cucumber.rb
+- lib/daddy/cucumber/pause.rb
 - lib/daddy/cucumber/puts.rb
-- lib/daddy/cucumber/assert.rb
+- lib/daddy/cucumber/capture.rb
 - lib/daddy/cucumber/formatting.rb
-- lib/daddy/cucumber/pause.rb
-- lib/daddy/cucumber/step_definitions/click.rb
-- lib/daddy/cucumber/step_definitions/select.rb
+- lib/daddy/cucumber/html.rb
 - lib/daddy/cucumber/step_definitions/fill_in.rb
+- lib/daddy/cucumber/step_definitions/select.rb
+- lib/daddy/cucumber/step_definitions/click.rb
 - lib/daddy/cucumber/step_definitions/common.rb
+- lib/daddy/cucumber/assert.rb
 - lib/daddy/cucumber/table.rb
-- lib/daddy/formatter/daddy.js
-- lib/daddy/formatter/cucumber.css
-- lib/daddy/formatter/html.rb
-- lib/daddy/formatter/daddy.css
+- lib/daddy/cucumber/diff.rb
+- lib/daddy/helpers/html_helper.rb
+- lib/daddy/capistrano/remote_cache_subdir.rb
+- lib/daddy/http_client.rb
+- lib/daddy/ocr.rb
+- lib/daddy/git.rb
+- lib/daddy/rails/hooks.rb
+- lib/daddy/rails/quiet_assets.rb
+- lib/daddy/model.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/daddy.js
 - lib/daddy/formatter/jquery-min.js
-- lib/daddy/differ/html_patch.rb
-- lib/daddy/rails/quiet_assets.rb
-- lib/daddy/rails/hooks.rb
+- lib/daddy/railtie.rb
 - lib/daddy/models/crud_extension.rb
 - lib/daddy/models/query_extension.rb
-- lib/daddy/git.rb
-- lib/daddy/capistrano/remote_cache_subdir.rb
-- lib/daddy/helpers/html_helper.rb
+- lib/daddy/differ/html_patch.rb
 - lib/daddy/utils/sql_utils.rb
 - lib/daddy/utils/string_utils.rb
-- lib/daddy/http_client.rb
-- lib/daddy/model.rb
-- lib/daddy/cucumber.rb
-- lib/daddy.rb
 - lib/sql_builder.rb
+- lib/ssl/cert.pem
+- lib/tasks/tesseract.rake
+- lib/tasks/jenkins
+- lib/tasks/nginx.repo
+- lib/tasks/nginx.jenkins.conf.erb
+- lib/tasks/jenkins.rake
+- lib/tasks/dad.rake
+- lib/tasks/db_config.rake
+- lib/tasks/publish.rake
+- lib/tasks/cucumber_steps.rake
+- lib/tasks/unicorn.rb.erb
+- lib/tasks/db_fixtures.rake
+- lib/tasks/cucumber.rake
+- lib/tasks/nginx.rake
+- lib/tasks/jenkins.conf
+- lib/tasks/generate/controller.rake
+- lib/tasks/generate/view.rake
+- lib/tasks/generate/templates/index.html.erb
+- lib/tasks/generate/templates/show.html.erb
+- lib/tasks/generate/templates/edit.html.erb
+- lib/tasks/generate/templates/new.html.erb
+- lib/tasks/generate/templates/controller.rb.erb
+- lib/tasks/generate/templates/_form.html.erb
+- 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.app.conf.erb
+- lib/tasks/nginx.conf.erb
 homepage: https://github.com/ichylinux/daddy
 licenses:
 - MIT
+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: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: My rails dad
 test_files: []