daddy 0.1.5 → 0.1.6

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    OWE4YWYwZTQ0ODgzYTlmMjY2YzgzYzkyNzc1OTE4MGUzNWFhN2YyNg==
+  data.tar.gz: !binary |-
+    NDkyMzI2ZWFmYWU3Mjc2MmViZjc5MDJiODAzNzE0YTYyMTg0OTMxNg==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    OWM3MGU0ODc5OTE2MjNmYmM5Nzk2NWQ2MjAyOGViYTg5NjFkZGVmMTczODQ1
+    ZGQxM2NlMjQxNjBkNzU2ZTg3NWM0N2YyNWYzYzVjM2M5ZDViNjIzYmVlYWJi
+    YmYzMzBiYzUyNjA4NjQ3M2FkMTI0MjIzNjMzNTU4MGI2Mzk2MTk=
+  data.tar.gz: !binary |-
+    NDM5NDI5NjhiMTQ2ZWM4NWMzN2IwMTRmZjdkMWMzNjc3NWY1ZWE4OWMyMDVj
+    ZmQ0NjQ4M2Q5ZTczNDE1NmY5YjljODY2NmI4NmU1Y2Y4YzlmZDcyNGU3MDZl
+    ZTY2NjgzZTVhMGE4ZWQ1MDcwNmNlZmJhYjRjMDRlZGE0YmY1NGI=

data/lib/daddy.rb

@@ -3,3 +3,5 @@
 module Daddy
   require "daddy/railtie" if defined?(Rails)
 end
+
+require 'sql_builder'

data/lib/daddy/cucumber.rb

@@ -50,11 +50,32 @@ AfterConfiguration do |configuration|
   }
 end
 
+begin
+  require 'database_cleaner'
+  require 'database_cleaner/cucumber'
+
+  DatabaseCleaner.strategy = :truncation
+rescue NameError
+  raise "You need to add database_cleaner to your Gemfile (in the :test group) if you wish to use it."
+end
+
 Before do
+  DatabaseCleaner.start
+
   ActiveRecord::Fixtures.reset_cache
   fixtures_folder = File.join(Rails.root, 'test', 'fixtures')
   fixtures = Dir[File.join(fixtures_folder, '*.yml')].map {|f| File.basename(f, '.yml') }
   ActiveRecord::Fixtures.create_fixtures(fixtures_folder, fixtures)
+  if defined? RailsCsvFixtures
+    fixtures = Dir[File.join(fixtures_folder, '*.csv')].map {|f| File.basename(f, '.csv') }
+    ActiveRecord::Fixtures.create_fixtures(fixtures_folder, fixtures)
+  end
+end
+
+After do |scenario|
+  DatabaseCleaner.clean
+end
 
+Before do
   resize_window(1280, 720)
 end

data/lib/daddy/cucumber/step_definitions/click.rb

@@ -0,0 +1,17 @@
+# coding: UTF-8
+
+もし /^(.*?)をクリック$/ do |name|
+  click_on name
+end
+
+もし /^(.*?)をクリックする$/ do |name|
+  click_on name
+end
+
+もし /^(.*?) をクリック$/ do |name|
+  click_on name
+end
+
+もし /^(.*?) をクリックする$/ do |name|
+  click_on name
+end

data/lib/daddy/cucumber/step_definitions/common.rb

@@ -1,9 +1,5 @@
 # coding: UTF-8
 
-もし /^(.*?) をクリック(する)?$/ do |name, suffix|
-  click_on name
-end
-
 もし /^(.*?) を選択(する)?$/ do |name, suffix|
   click_on name
 end

data/lib/daddy/formatter/daddy.css

@@ -69,6 +69,7 @@ h2 {
   background: #F0F8FF;
   color: #001111;
   margin-left: 15px;
+  padding-right: 30px;
 }
 
 .feature_dir {
@@ -145,10 +146,12 @@ del.differ {
 }
 
 .screenshot {
+  display: block;
   border: solid 1px #999999;
   border-radius: 5px 5px;
   margin: 5px 0;
+  padding: 10px;
   background: #ffffff;
-  max-width: 99%;
-  max-height: 99%;
+  max-width: 100%;
+  max-height: 100%;
 }

data/lib/daddy/formatter/daddy_html.rb

@@ -8,7 +8,7 @@ module Daddy
         ret = ''
         
         split = feature.file.split('/')
-        split.reverse[1..-1].each_with_index do |dir, i|
+        split.reverse[1..-2].each_with_index do |dir, i|
           break if dir == '仕様書' or dir == '開発日記'
 
           if i == 0

data/lib/daddy/models/acts_as_like.rb

@@ -1,28 +1,25 @@
 # coding: UTF-8
 
-require 'daddy/utils/sql_utils'
-
 module Daddy
   module Models
     
     module ActsAsLike
-      module Mixin
-        def acts_as_like(options = {})
-          extend ClassMethods
-          include InstanceMethods
-        end
+      def self.included(base)
+        base.extend(ClassMethods)
+      end
+
+      module InstanceMethods
       end
-      
+
       module ClassMethods
+        require 'daddy/utils/sql_utils'
+        include ActsAsLike::InstanceMethods
 
         def like(columns, keywords)
           where(Daddy::Utils::SqlUtils.like(columns, keywords))
         end
-
-      end
-      
-      module InstanceMethods
       end
+
     end
 
   end

data/lib/daddy/railtie.rb

@@ -20,10 +20,14 @@ require 'daddy/model'
 require 'daddy/helpers/html_helper'
 require 'daddy/models/acts_as_like'
 
-Object.send :include, Daddy::Models::ActsAsLike::Mixin
-
 module Daddy
   class Railtie < Rails::Railtie
+    initializer 'acts_as_like' do
+      ActiveSupport.on_load :active_record do
+        ActiveRecord::Base.send(:include, Daddy::Models::ActsAsLike)
+      end
+    end
+
     rake_tasks do
       lib = File.dirname(File.dirname(__FILE__))
       Dir[File.join(lib, 'tasks/*.rake')].each do |f|

data/lib/sql_builder.rb

@@ -0,0 +1,69 @@
+# coding: UTF-8
+
+class SqlBuilder
+
+  def initialize
+    @sql = []
+    @params = []
+  end
+
+  def append(*args)
+    if args.size == 1
+      if args[0].is_a?(Array)
+        append_array(args[0])
+      elsif args[0].is_a?(SqlBuilder)
+        append(args[0].to_a)
+      else
+        append_string(args[0])
+      end
+    else
+      append_array(args)
+    end
+
+    self
+  end
+  
+  def and(*args)
+    append_string('and (')
+    
+    if block_given?
+      yield self
+    else
+      append(*args)
+    end
+    
+    append_string(')')
+  end
+
+  def or(*args)
+    append_string('or (')
+
+    if block_given?
+      yield self
+    else
+      append(*args)
+    end
+
+    append_string(')')
+  end
+  
+  def to_a
+    [@sql.join(' ')] + @params
+  end
+  
+  private
+  
+  def append_string(sql)
+    @sql << sql
+  end
+  
+  def append_array(array)
+    array.each_with_index do |x, i|
+      if i == 0
+        append_string(x)
+      else
+        @params << x
+      end
+    end
+  end
+end

data/lib/tasks/cucumber.rake

@@ -8,7 +8,7 @@ namespace :dad do
     format = ENV['FORMAT'] || 'Daddy::Formatter::Html'
 
     options = [
-      "DRIVER=" + (ENV['DRIVER'] || 'webkit'),
+      "DRIVER=" + (ENV['DRIVER'] || 'selenium'),
       "PAUSE=" + (ENV['PAUSE'] || '0'),
       "COVERAGE=" + (ENV['COVERAGE'] || 'true'),
       "EXPAND=" + (ENV['EXPAND'] || 'true')

data/lib/tasks/jenkins.rake

@@ -1,28 +1,34 @@
 # coding: UTF-8
 
 require 'rake'
+require 'term/ansicolor'
+include Term::ANSIColor
 
 namespace :dad do
   namespace :jenkins do
 
     desc 'Jenkinsをインストールします。'
     task :install do
-      [
-        "sudo bash #{File.dirname(__FILE__)}/jenkins_install.sh",
+      commands = [
+        "sudo yum install httpd-devel libxslt-devel libxml2-devel java-1.7.0-openjdk qt-webkit-devel Xvfb firefox",
+        "sudo wget -O /etc/yum.repos.d/jenkins.repo http://pkg.jenkins-ci.org/redhat/jenkins.repo",
+        "sudo rpm --import http://pkg.jenkins-ci.org/redhat/jenkins-ci.org.key",
+        "sudo yum install jenkins",
         "sudo cp -f #{File.dirname(__FILE__)}/jenkins.conf /etc/httpd/conf.d",
         "sudo cp -f #{File.dirname(__FILE__)}/jenkins /etc/sysconfig",
         "sudo chown root:root /etc/sysconfig/jenkins",
         "sudo chmod 600 /etc/sysconfig/jenkins",
         "sudo mkdir -p /var/lib/jenkins/plugins",
         "sudo chown jenkins:jenkins /var/lib/jenkins/plugins",
-      ].each do |command|
-        puts command
+      ]
+      commands.each do |command|
+        print blue, bold, command, reset, "\n"
         system(command)
       end
 
       plugins = [
-        {:name => 'build-pipeline-plugin', :version => '1.3.3'},
-        {:name => 'git', :version => '1.1.26'},
+        {:name => 'build-pipeline-plugin', :version => '1.3.5'},
+        {:name => 'git', :version => '1.4.0'},
         {:name => 'rake', :version => '1.7.7'},
         {:name => 'rubyMetrics', :version => '1.5.0'},
         {:name => 'htmlpublisher', :version => '1.2'},
@@ -32,12 +38,13 @@ namespace :dad do
 
         unless File.exist?(download_path)
           command = "sudo wget http://updates.jenkins-ci.org/download/plugins/#{p[:name]}/#{p[:version]}/#{p[:name]}.hpi -O #{download_path}"
-          puts command
-          system command
+          print blue, bold, command, reset, "\n"
+          system(command)
         end
         
-        plugin_path = "/var/lib/jenkins/plugins/#{p[:name]}.hpi"
-        system("sudo cp -f #{download_path} #{plugin_path}")
+        command = "sudo cp -f #{download_path} /var/lib/jenkins/plugins/#{p[:name]}.hpi"
+        print blue, bold, command, reset, "\n"
+        system(command)
       end
     end
 

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: daddy
 version: !ruby/object:Gem::Version
-  version: 0.1.5
-  prerelease: 
+  version: 0.1.6
 platform: ruby
 authors:
 - ichy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-17 00:00:00.000000000 Z
+date: 2013-07-25 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: capybara-webkit
   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
   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: cucumber-rails
   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: ci_reporter
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -86,7 +76,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: database_cleaner
+  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
@@ -94,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: differ
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -102,7 +104,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -110,7 +111,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: poltergeist
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,7 +118,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -126,7 +125,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -134,7 +132,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -142,7 +139,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rails-i18n
   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: selenium-webdriver
   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: simplecov
   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: simplecov-rcov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -198,7 +188,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: term-ansicolor
+  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
@@ -210,71 +213,72 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- 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/capture.rb
-- lib/daddy/cucumber/assert.rb
+- 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/click.rb
 - lib/daddy/cucumber/step_definitions/common.rb
+- lib/daddy/cucumber/assert.rb
 - lib/daddy/cucumber/table.rb
-- 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/git.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/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/daddy/model.rb
-- lib/daddy/cucumber.rb
-- lib/daddy.rb
+- lib/sql_builder.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/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
 homepage: https://github.com/ichylinux/daddy
-licenses: []
+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: []

data/lib/tasks/jenkins_install.sh

@@ -1,11 +0,0 @@
-#!/bin/bash
-
-echo "ライブラリのインストール"
-  yum install httpd-devel libxslt-devel libxml2-devel java-1.7.0-openjdk qt-webkit-devel Xvfb firefox
-
-echo "リポジトリ情報を取得"
-  wget -O /etc/yum.repos.d/jenkins.repo http://pkg.jenkins-ci.org/redhat/jenkins.repo
-  rpm --import http://pkg.jenkins-ci.org/redhat/jenkins-ci.org.key
-
-echo "Jenkinsをインストール"
-  yum install jenkins