daddy 0.0.8 → 0.0.9

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NmRjODU2MzVhNDE2MjdmNTBkNjI3ZjY0MzAzNjJjYjZhMjhhMTE1Zg==
+    Yjc0ZGJlZjU5MTRlN2E0NmUyMmM0NmU4MGMyMWVjZmZkMGQyZmQ0Nw==
   data.tar.gz: !binary |-
-    ZjJkOTQ1ODc3NGM5MmE3ZjcxMjIyOTg2N2FmZWU4ZDVkYmUzM2UwNg==
+    OWI0M2NkNjhiYTI0ODJjODQzMzk0NjU2ZGE3MTU4NDIwZDAyOTI2OQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZThlM2MyMWJmMDAzNzA3OTlkODYyMjc0MjRkNmYyMGNkNDNjMzc3Nzg4OTgw
-    NjcwZGM5MmI4OGUyYzJhODFhZmRlZGQ5YjIwNzZjZWFjNDdjMjdiMjMxM2Yy
-    M2E1MzAyNTdlODRjNzNkOTFkODM3ZGQzMDM2OTRmNWE4OGY4ZTI=
+    ZGVmOWU1MzFlNTNiMzc0NGEwNDVmN2VmNWQ2ZTRhNzk1MThjZDYxYTAzOTA2
+    ZDIzZmQ5YTQ2NzRmZWVkMjkyNjQxNjkzYzQ0NTQwYWY0Y2FmYmE0N2VhNzVi
+    MGJiYTE0MjkxMmI1OWY5YjAwNWJlYzBmZGE2MjRhNDAzMTZiMGM=
   data.tar.gz: !binary |-
-    ZmMwMDBmZGYyMGVjZDg3NjFiOTgzYTMwZGFkYTE0MmM2NTYyYmQ3Y2U3YzUx
-    YmQ1MmMwOTE4YmJjOWI5ODM3YjAzMjc1MmM0MmM4ZmFjMzljNjI0OTBjNmQy
-    MWNjMWViYjYwNjY0ZmYzZTdhMzY1OWRmZGQ1ZWU5NjdjYzhkMTA=
+    YTRhNTc2MDQwYzQwOTkzZjI5MDhhOWE5Y2I2OTNhNzBjNzYyZDAyZmUwN2Qy
+    ODgzYTIzNDA4YTZhMGQ1NmQ5Njk5MTE5ZjZjYWMwMzNlMTg4NDRjY2ViNTk0
+    NDQwNjllNjIzYmI0ZTc1MTYzZDljZDg0Nzk4MDYxYTNlOGY2MmQ=

data/lib/daddy/cucumber.rb

@@ -1,19 +1,19 @@
 # coding: UTF-8
 
 require 'cucumber/rails'
-require "capybara/webkit"
+require 'capybara/webkit'
+require 'differ'
+
+Differ.format :html
 
 Capybara.default_driver = (ENV['DRIVER'] || :selenium).to_sym
 Capybara.default_selector = :css
 
 ActionController::Base.allow_rescue = false
 
-require 'daddy/cucumber/assert'
-require 'daddy/cucumber/capture'
-require 'daddy/cucumber/table'
-World(Daddy::Cucumber::Assert)
-World(Daddy::Cucumber::Capture)
-World(Daddy::Cucumber::Table)
+Dir::glob(File.dirname(__FILE__) + '/cucumber/*.rb').each do |file|
+  require file
+end
 
 Dir::glob(File.dirname(__FILE__) + '/cucumber/step_definitions/*.rb').each do |file|
   load file
@@ -46,3 +46,10 @@ AfterConfiguration do |configuration|
     sorted_files
   }
 end
+
+Before do
+  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)
+end

data/lib/daddy/cucumber/assert.rb

@@ -119,3 +119,5 @@ module Daddy
     end
   end
 end
+
+World(Daddy::Cucumber::Assert)

data/lib/daddy/cucumber/capture.rb

@@ -9,6 +9,7 @@ module Daddy
       @@_screen_count = 0
     
       def capture(url = nil)
+        pause
     
         url ||= remove_domain(current_url)
     
@@ -30,3 +31,5 @@ module Daddy
     end
   end
 end
+
+World(Daddy::Cucumber::Capture)

data/lib/daddy/cucumber/html.rb

@@ -0,0 +1,56 @@
+# coding: UTF-8
+
+module Daddy
+  module Cucumber
+    module Html
+      
+      def find_tr(table_selector, text, fail_on_missing = true)
+        within table_selector do
+          all('tr').each do |tr|
+            if tr.text.include?(text)
+              if block_given?
+                within tr do
+                  yield tr
+                end
+              end
+              return tr
+            end
+          end
+        end
+        
+        fail "テーブル #{table_selector} 内に #{text} を含む行が見つかりませでした。" if fail_on_missing
+      end
+    
+      def find_option(select_selector, text, fail_on_missing = true)
+        within select_selector do
+          all('option').each do |option|
+            if option.text.include?(text)
+              if block_given?
+                within option do
+                  yield
+                end
+              end
+              return option
+            end
+          end
+        end
+        
+        fail "セレクトボックス #{select_selector} 内に #{text} を含むオプションが見つかりませでした。" if fail_on_missing
+      end
+
+      def confirm(ok = true)
+        puts("確認ダイアログで #{ok ? 'OK' : 'キャンセル'} をクリック")
+        return unless Capybara.current_driver == :selenium
+
+        if ok
+          page.driver.browser.switch_to.alert.accept
+        else
+          page.driver.browser.switch_to.alert.deny
+        end
+      end
+
+    end
+  end
+end
+
+World(Daddy::Cucumber::Html)

data/lib/daddy/cucumber/pause.rb

@@ -0,0 +1,25 @@
+# coding: UTF-8
+
+module Daddy
+  module Cucumber
+    module Pause
+      
+      def pause(second = nil)
+        duration = (second || ENV['PAUSE'] || 1).to_i 
+        sleep(duration) if duration > 0
+      end
+      
+      def wait_until
+        pause_count = 5
+        while pause_count > 0 do
+          break if yield
+          pause
+          pause_count -= 1
+        end
+      end
+    
+    end
+  end
+end
+
+World(Daddy::Cucumber::Pause)

data/lib/daddy/cucumber/table.rb

@@ -22,3 +22,5 @@ module Daddy
     end
   end
 end
+
+World(Daddy::Cucumber::Table)

data/lib/daddy/formatter/daddy.css

@@ -1,6 +1,6 @@
 #menu {
+  width: 100px;
   float: left;
-  margin-right: 10px;
   background: #FFFFFF;
   color: #000000;
 }
@@ -23,17 +23,18 @@
 
 #menu ol li.sub_menu {
   margin: 0;
-  padding: 0 20px 0 20px;
+  padding: 0 5px;
   border-left: 5px solid #65c400;
   border-bottom: 1px solid #65c400;
-  line-height: 40px;
+  line-height: 30px;
+  text-align: right;
   vertical-align: middle;
   font-size: 1.2em;
   font-weight: bold;
 }
 
 .contents {
-  margin-left: 120px;
+  margin-left: 100px;
 }
 
 .cucumber .scenario h3, td .scenario h3, th .scenario h3, .background h3 {

data/lib/daddy/formatter/menu.html.erb

@@ -1,35 +1,36 @@
 <%
-  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/')
-    branches << b.strip.sub('remotes/origin/', '')
-  end
-  
-  branches.sort! do |a, b|
-    if a == 'master'
-      -1
-    elsif b == 'master'
-      1
-    else
-      b <=> a
-    end
-  end
-%>
-<% branches.each do |b| %>
+  load File.dirname(File.dirname(__FILE__)) + '/git.rb'
+  git = Daddy::Git.new
+-%>
+
+<script>
+  $(document).ready(function() {
+    $('.sprint').mouseover(function() {
+      $(this).css('background', '#F0F8FF').css('cursor', 'pointer');
+    }).mouseout(function() {
+      $(this).css('background', '#FFFFFF');
+    }).click(function() {
+      $(this).nextAll('.sub_menu').toggle(250);
+    });
+
+    $('.current').click();
+  });
+</script>
+
+<% git.branches.each do |b| %>
   <ol>
     <% title = (b == 'master' ? '最新' : 'スプリント ' + b.gsub(/[a-zA-Z]*/, '')) %>
-    <li class="sprint">
+
+    <li class="sprint <%= 'current' if b == git.current_branch %>">
       <%= title %>
     </li>
-    <li class="sprint sub_menu">
+    <li class="sub_menu" style="display: none;">
       <a href="../<%= b %>/index.html">仕様書</a>
     </li>
-    <li class="sprint sub_menu">
+    <li class="sub_menu" style="display: none;">
       <a href="../<%= b %>/diary.html">開発日記</a>
     </li>
-    <li class="sprint sub_menu">
+    <li class="sub_menu" style="display: none;">
       <a href="../<%= b %>/coverage/rcov/index.html" target="_blank">カバレッジ</a>
     </li>
   </ol>

data/lib/daddy/git.rb

@@ -0,0 +1,39 @@
+# coding: UTF-8
+
+Dir::glob(File.dirname(__FILE__) + '/git/*.rb').each do |file|
+  require file
+end
+
+module Daddy
+  
+  class Git
+    def branches
+      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/')
+        branches << b.strip.sub('remotes/origin/', '')
+      end
+      
+      branches.sort! do |a, b|
+        if a == 'master'
+          -1
+        elsif b == 'master'
+          1
+        else
+          b <=> a
+        end
+      end
+      
+      branches
+    end
+    
+    def current_branch
+      `git branch`.split("\n").each do |b|
+        return b.split.last if b.start_with?('*')
+      end
+    end
+  end
+
+end

data/lib/tasks/publish.rake

@@ -1,20 +1,21 @@
 # coding: UTF-8
 
+require 'daddy/git'
+
 namespace :dad do
-  task :publish do |t|
+  task :publish do
     system("mkdir -p features/reports")
     system("bundle exec rake db:test:prepare")
     system("bundle exec rake dad:cucumber PUBLISH=true OUTPUT_FILE=diary.html features/開発日記")
     system("bundle exec rake dad:cucumber PUBLISH=true OUTPUT_FILE=index.html features/仕様書")
 
     system("mkdir -p tmp")
-    system("git branch > tmp/branches")
-    current_branch = 'master'
-    File.readlines('tmp/branches').each do |b|
-      if b.start_with?('*')
-        current_branch = b.split[1]
-        break
-      end
+
+    if ENV['BRANCH']
+      current_branch = ENV['BRANCH']
+    else
+      git = Daddy::Git.new
+      current_branch = git.current_branch
     end
   
     unless File.exist?('tmp/gh-pages')
@@ -34,4 +35,5 @@ namespace :dad do
     system("cd tmp/gh-pages && git commit -m 'publish'")
     system("cd tmp/gh-pages && git push")
   end
+  
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daddy
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - ichy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-15 00:00:00.000000000 Z
+date: 2013-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -108,6 +108,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: differ
+  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
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -187,10 +201,13 @@ 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/git.rb
 - lib/daddy/formatter/menu.html.erb
 - lib/daddy/formatter/html.rb
 - lib/daddy/formatter/daddy.css