daddy 0.1.20 → 0.1.22

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTMzNjJlOTUzYzJjOTg2MTEzMjM3YTcwYzA1OGU2ODYzMTVmZWE0OA==
+    ZjVkNTQyMjg5YzkzOTcxNWU4Njc5NzdmYmE1MDYyNDhjMGZmNTZkYQ==
   data.tar.gz: !binary |-
-    ZjAzMDk4MWZjYzQ1MzQyNzZmYzY5NmIyNGExM2NkMjVhZjBhZmFkMA==
+    YjRkZjdmYzM1ODEzY2RhZGFjNjNjYjE1Njc2MTRjYTcwZmJjMDI2OA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZTgxZTYzYmJjOWVkYmFhZmFmNzUzMzlhODFhNDY0Yjg3Mzg1ZDNiNzhmM2Jl
-    OTliNjc0YTY3ZGJlNGUwMTEzMTZkZGM3YmVlMGM2ODY3NmNhZDVlODM5MzM5
-    MzI5MjBmNTljZmIzODQwMjVmZmRkODY0ZGEwZWU3NTIwNWM3ZTU=
+    ZTQxZTAzYzhkYmE0NWUxN2M0ZDQ5YmEwYjlkZjI5ODEzY2RhYzY0ZTNiN2Q5
+    ZTBiM2ZlMzZhNzQ0YzdlNWFmOWU4Nzk0ZWJiZDdmNTIzYjkxNmNiN2YzOTI4
+    YTVhOTg3OWQzYzdjZmM1YTk4YzQwZDJmMGQ2MWMwODBhYzZlNzA=
   data.tar.gz: !binary |-
-    NGFiY2ZhMzY3M2RmZDlkYWU1ODcxMjgyNmM4ODU5ZTQ5ZmI5ZTc0ZGRiZmNh
-    NzU1Y2ZkMWY2N2Y0OWNlYTg3NWRjYmFkM2U0YTU3NzRiMWNkZTVhOGE5YWYz
-    MWJhZDVlMDZlMzk5MTdjYjRhOGYzNDJhZTI4MmMzNmI4MDk3YTY=
+    MTJmZTgzMGYwMTUxY2NkMjQyMTkzMDc4M2U4MTcwZjlmYzJjMDM3ZWY1Mjg4
+    OWE2MDBjMzc3OTAzMzY4NDgzODAyNTQ2OGU2MDgzMzZkYzJkNzA4ODczZGE2
+    NWI3NmU0ZGZkZTdjMGUyZTI4YmU2YWI5NDBjNmY1MDQ2NGU3Yzk=

data/bin/dad

@@ -0,0 +1,70 @@
+#!/usr/bin/env ruby
+
+GEMFILE = <<-EOF
+source 'https://rubygems.org'
+
+gem 'rails', '3.2.15'
+
+# Bundle edge Rails instead:
+# gem 'rails', :git => 'git://github.com/rails/rails.git'
+
+gem 'daddy'
+gem 'mysql2'
+
+# Gems used only for assets and not required
+# in production environments by default.
+group :assets do
+  gem 'sass-rails',   '~> 3.2.3'
+  gem 'coffee-rails', '~> 3.2.1'
+
+  # See https://github.com/sstephenson/execjs#readme for more supported runtimes
+  # gem 'therubyracer', :platforms => :ruby
+
+  gem 'uglifier', '>= 1.0.3'
+end
+
+gem 'jquery-rails'
+
+group :development, :test do
+  gem 'thin'
+end
+
+# To use ActiveModel has_secure_password
+# gem 'bcrypt-ruby', '~> 3.0.0'
+
+# To use Jbuilder templates for JSON
+# gem 'jbuilder'
+
+# Use unicorn as the app server
+gem 'unicorn'
+
+# Deploy with Capistrano
+# gem 'capistrano'
+
+# To use debugger
+# gem 'debugger'
+EOF
+
+ROUTES = <<-EOF
+Banbanlive::Application.routes.draw do
+  # root :to => 'welcome#index'
+end
+EOF
+
+action = ARGV[0]
+
+if action == 'new'
+  app_name = ARGV[1]
+  rails_version = "3.2.15"
+  
+  [
+    "rails _#{rails_version}_ new #{app_name} -d mysql --skip-bundle",
+    "echo \"#{GEMFILE}\" > #{app_name}/Gemfile",
+    "echo \"#{ROUTES}\" > #{app_name}/config/routes.rb",
+    "cd #{app_name} && sudo bundle install",
+    "cd #{app_name} && bundle exec rake dad:install",
+    "cd #{app_name} && bundle exec rake dad:db:config",
+  ].each do |command|
+    exit 1 unless system(command)
+  end
+end

data/lib/daddy/cucumber.rb

@@ -55,7 +55,7 @@ AfterConfiguration do |configuration|
   }
 end
 
-require_relative 'rails/hooks' if defined?(Rails)
+require_relative 'cucumber/hooks/database' if defined?(Rails)
 
 Before do
   resize_window(1280, 720)

data/lib/daddy/cucumber/capture.rb

@@ -9,7 +9,7 @@ module Daddy
     
       @@_screen_count = 0
     
-      def capture
+      def capture(options = {})
         pause
 
         url = Rack::Utils.unescape(current_url)
@@ -19,10 +19,8 @@ module Daddy
         image = "#{IMAGE_DIR}/#{@@_screen_count}.png"
         page.driver.save_screenshot("#{REPORT_DIR}/#{image}")
 
-        puts %{
-          <div>#{url}</div>
-          <img class="screenshot" src="#{image}"/>
-        }
+        puts "<div>#{url}</div>" unless options[:suppress_url]
+        puts "<img class=\"screenshot\" src=\"#{image}\"/>"
       end
 
       def resize_window(width, height)

data/lib/daddy/formatter/daddy.css

@@ -99,6 +99,12 @@ div.contents {
 }
 
 div.feature .narrative {
+  margin: 10px;
+  line-height: 1.5em;
+  font-size: 1.2em;
+}
+
+div.feature .narrative > div {
   margin-left: 10px;
 }
 
@@ -181,3 +187,9 @@ del.differ {
   max-width: 98%;
   max-height: 98%;
 }
+
+blockquote {
+  border: solid 1px #999999;
+  border-radius: 5px 5px;
+  padding: 5px;
+}

data/lib/daddy/formatter/daddy_html.rb

@@ -63,6 +63,16 @@ module Daddy
         ['t', 'true'].include?(ENV['EXPAND'].to_s.downcase)
       end
 
+      def magic_comment?(comment_line)
+        comment = comment_line.to_s
+
+        ['language', 'format'].each do |magic|
+          return true if /#\s*#{magic}\s*:.*/ =~ comment
+        end
+        
+        false
+      end
+
     end
   end
 end

data/lib/daddy/formatter/html.rb

@@ -90,19 +90,22 @@ module Daddy
       end
 
       def before_comment(comment)
-        return if comment == '# language: ja'
-        @builder << '<pre class="comment">'
+        unless magic_comment?(comment)
+          @builder << '<pre class="comment">'
+        end
       end
 
       def after_comment(comment)
-        return if comment == '# language: ja'
-        @builder << '</pre>'
+        unless magic_comment?(comment)
+          @builder << '</pre>'
+        end
       end
 
       def comment_line(comment_line)
-        return if comment_line == '# language: ja'
-        @builder.text!(comment_line)
-        @builder.br
+        unless magic_comment?(comment_line)
+          @builder.text!(comment_line)
+          @builder.br
+        end
       end
 
       def after_tags(tags)
@@ -117,23 +120,22 @@ module Daddy
 
       def feature_name(keyword, name)
         title = feature_dir(@feature, true) + @feature.file.split('/').last.gsub(/\.feature/, '')
+        lines = name.split(/\r?\n/)
 
         @builder.h2 do |h2|
           @builder.span(:class => 'val') do
             @builder << title
-            unless name.strip.blank?
-              @builder.span('(' + name.strip + ')', :class => 'feature_subtitle')
+
+            subtitle = lines.first.to_s.strip 
+            unless subtitle.blank?
+              @builder.span('(' + subtitle + ')', :class => 'feature_subtitle')
             end
           end
         end
 
-        lines = name.split(/\r?\n/)
         if lines.size > 1
-          @builder.p(:class => 'narrative') do
-            lines[1..-1].each do |line|
-              @builder.text!(line.strip)
-              @builder.br
-            end
+          @builder.div(:class => 'narrative') do
+            @builder << lines[1..-1].join("\n")
           end
         end
       end

data/lib/daddy/git.rb

@@ -7,9 +7,7 @@ module Daddy
     def branches(remote = false)
       branches = []
       `git branch -a`.split("\n").each do |b|
-        next if b.index('HEAD')
-        next if b.index('gh-pages')
-        next unless b.index('remotes/origin/')
+        next unless b.index('remotes/origin/master') or b.index(/remotes\/origin\/p[0-9]+(\.[0-9]+)?/)
         
         if remote
           branches << b.strip
@@ -25,9 +23,9 @@ module Daddy
           1
         else
           if remote
-            b.sub('remotes/origin/p', '').to_i <=> a.sub('remotes/origin/p', '').to_i
+            b.sub('remotes/origin/p', '').to_f <=> a.sub('remotes/origin/p', '').to_f
           else
-            b.sub('p', '').to_i <=> a.sub('p', '').to_i
+            b.sub('p', '').to_f <=> a.sub('p', '').to_f
           end
         end
       end

data/lib/tasks/publish.rake

@@ -47,6 +47,9 @@ namespace :dad do
         dad_publish_extract_features(dir).each do |div|
           feature = features[div['id']]
           if feature
+            div.css('div.narrative').each do |narrative|
+              feature.add_child(narrative)
+            end
             div.css('div.scenario').each do |scenario|
               feature.add_child(scenario)
             end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daddy
 version: !ruby/object:Gem::Version
-  version: 0.1.20
+  version: 0.1.22
 platform: ruby
 authors:
 - ichy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-14 00:00:00.000000000 Z
+date: 2013-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -250,7 +250,8 @@ dependencies:
         version: '0'
 description: Daddy helps me build rails applications since daddy knows some good practices.
 email: ichylinux@gmail.com
-executables: []
+executables:
+- dad
 extensions: []
 extra_rdoc_files: []
 files:
@@ -261,6 +262,7 @@ files:
 - lib/daddy/cucumber/capture.rb
 - lib/daddy/cucumber/formatting.rb
 - lib/daddy/cucumber/html.rb
+- lib/daddy/cucumber/hooks/database.rb
 - lib/daddy/cucumber/step_definitions/fill_in.rb
 - lib/daddy/cucumber/step_definitions/select.rb
 - lib/daddy/cucumber/step_definitions/click.rb
@@ -273,7 +275,6 @@ files:
 - 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
@@ -323,6 +324,7 @@ files:
 - lib/tasks/database.yml.erb
 - lib/tasks/nginx.app.conf.erb
 - lib/tasks/nginx.conf.erb
+- bin/dad
 homepage: https://github.com/ichylinux/daddy
 licenses:
 - MIT