daddy 0.2.12 → 0.2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73f1816d995079c15c31166434b1901e91b7703a
-  data.tar.gz: 88e2987c1b79e2b5c1e6ff94466c9ae5b1640431
+  metadata.gz: 07f46ca45e9a85190b5d6ce0717138db05aed390
+  data.tar.gz: 54ec45bf1cff99e654a5e153d9c50d6ff9c9bbaf
 SHA512:
-  metadata.gz: 1950fefd2010ccb6819016e517903919ec808c615cefaab20482285339a6dc5055c7e2fa134660f0f5b33120461fa6493ed7184ad4d5791435bbcb1e599af6d8
-  data.tar.gz: 39403aa998b88bbd11a3c53829b7e82750d99306de00450cbd4ae8e23eb497121e29bebd78854d163a188cc35a7bc7ebe8c60db09fb229f6f822d991eaaee672
+  metadata.gz: 39b3333f363be123447bf7122bc6cd73a67f05b86249df25962f66f9cc91e2b2dcd9c3dcd4aa68a3478f84458f767db8eec78c93c377595d7f0bbdc9e2be5c5e
+  data.tar.gz: f59575e2a410ecc40606bc7ba2e2ab25683c083d7bca05c9db2d2a5d71589100158f3b1e5e711ba904452df22a46dbbf38168cceff8275bb189a0d452ea3998e

data/lib/daddy/formatter/daddy_html.rb

@@ -1,3 +1,5 @@
+require 'erb'
+
 module Daddy
   module Formatter
     module DaddyHtml
@@ -29,10 +31,8 @@ module Daddy
       end
 
       def make_menu_for_publish
-        FileUtils.mkdir_p('tmp')
-        menu = File.join('tmp', 'menu.html')
-        system("erb -T - #{File.dirname(__FILE__)}/menu.html.erb > #{menu}")
-        File.read(menu)
+        template = File.join(File.dirname(__FILE__), 'menu.html.erb')
+        ERB.new(File.read(template), 0, '-').result
       end
 
       def feature_id

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

@@ -1,7 +1,6 @@
 <%
-  load File.dirname(File.dirname(__FILE__)) + '/git.rb'
   git = Daddy::Git.new
-  title = ENV['TITLE'].sub(' ', '_').downcase
+  title = Daddy.config.cucumber.title.sub(' ', '_').downcase
 -%>
 
 <script>

data/lib/tasks/generate/controller.rake

@@ -1,5 +1,3 @@
-# coding: UTF-8
-
 require 'rake'
 require 'erb'
 

data/lib/tasks/publish.rake

@@ -1,11 +1,9 @@
-# coding: UTF-8
-
 require 'daddy/git'
 require 'nokogiri'
 
 namespace :dad do
   task :publish do
-    fail('環境編集 TITLE を指定してください。') unless ENV['TITLE'] and not ENV['TITLE'].empty?
+    fail('設定「cucumber.title」がありません。') unless Daddy.config.cucumber.title?
 
     if File.exist?("db/schema.rb")
       fail unless system('rake db:schema:load RAILS_ENV=test')
@@ -30,7 +28,7 @@ namespace :dad do
     branch = git.current_branch
 
     # 公開
-    base_dir = dad_publish_base_dir(ENV['TITLE']) 
+    base_dir = dad_publish_base_dir
     system("sudo mkdir -p #{base_dir}")
     system("sudo chown -R #{ENV['USER']}:#{ENV['USER']} #{base_dir}") 
     system("mkdir -p #{base_dir}/#{branch}")
@@ -97,10 +95,10 @@ def self.dad_publish_extract_features(dir)
   ret
 end
 
-def self.dad_publish_base_dir(title)
-  '/var/lib/daddy/' + dad_publish_title_to_dirname(title) 
+def self.dad_publish_base_dir
+  '/var/lib/daddy/' + dad_publish_title_to_dirname 
 end
 
-def self.dad_publish_title_to_dirname(title)
-  title.sub(' ', '_').downcase
+def self.dad_publish_title_to_dirname
+  Daddy.config.cucumber.title.sub(' ', '_').downcase
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: daddy
 version: !ruby/object:Gem::Version
-  version: 0.2.12
+  version: 0.2.13
 platform: ruby
 authors:
 - ichy