daddy 0.3.4 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 926bde90c85ac8dfe4c5f9f9bcacbca184d2f87d
-  data.tar.gz: bd458599dcdfd5cbd62d1ec8a4389e7107072147
+  metadata.gz: d48e26063fd35fc7a26f713e0abff4a355a58e09
+  data.tar.gz: f2a4feafbff868243970e16dff1f8104b8bef551
 SHA512:
-  metadata.gz: 5b5ebc27b19c4723f15ce6b416765befcb5f440b92572bb012e639b12dda2b8e67119ccb3d44c5577dbe61ac0bd5e8425d0049c6429c270911f05153019ba1a3
-  data.tar.gz: eb2e3f9170796dfb6fd31c761c9b143d835645a0b9c817fadaa7725f9597541a68263a536d6ade41ac6093952deec89a9392b4bec97977300e7b2fe25594d84a
+  metadata.gz: 99e584d86c756663b175441dce9076e036ed2bca8d182a832f5e2f7a8127499f24b742717bb845b09473128641adb994062fcf1ca737e0ac6400fbd411245b3e
+  data.tar.gz: f8e105ffd8d57c032ca8c38cc30812925457650e81b4b22766ca5b344ed03c9649a7643ee29f3eafc8f664ed6f05198b8dabac7fc44208794f382bd4a0dc4e75

data/lib/daddy/git.rb

@@ -1,5 +1,3 @@
-# coding: UTF-8
-
 module Daddy
   
   class Git

data/lib/daddy/http_client.rb

@@ -1,5 +1,3 @@
-# coding: UTF-8
-
 require 'faraday'
 
 module Daddy

data/lib/daddy/models/crud_extension.rb

@@ -1,40 +1,32 @@
 module Daddy
   module Models
-    
     module CrudExtension
-      def self.included(base)
-        base.extend(ClassMethods)
-        base.__send__(:include, InstanceMethods)
-      end
-
-      module InstanceMethods
+      extend ActiveSupport::Concern
 
-        def readable_by?(user)
-          true
-        end
+      def readable_by?(user)
+        true
+      end
 
-        def creatable_by?(user)
-          readable_by?(user)
-        end
+      def creatable_by?(user)
+        readable_by?(user)
+      end
 
-        def updatable_by?(user)
-          readable_by?(user)
-        end
+      def updatable_by?(user)
+        readable_by?(user)
+      end
 
-        def deletable_by?(user)
-          readable_by?(user)
-        end
+      def deletable_by?(user)
+        readable_by?(user)
+      end
 
-        def destroy_logically!
-          self.deleted = true
-          save!
-        end
+      def destroy_logically!
+        self.deleted = true
+        save!
       end
 
       module ClassMethods
       end
 
     end
-
   end
 end

data/lib/daddy/models/query_extension.rb

@@ -2,13 +2,7 @@ module Daddy
   module Models
     
     module QueryExtension
-      def self.included(base)
-        base.extend(ClassMethods)
-        base.__send__(:include, InstanceMethods)
-      end
-
-      module InstanceMethods
-      end
+      extend ActiveSupport::Concern
 
       module ClassMethods
         require 'daddy/utils/sql_utils'

data/lib/daddy/ocr.rb

@@ -1,5 +1,3 @@
-# coding: UTF-8
-
 module Daddy
   class Ocr
     

data/lib/daddy/version.rb

@@ -1,3 +1,3 @@
 module Daddy
-  VERSION = '0.3.4'.freeze
+  VERSION = '0.3.6'.freeze
 end

data/lib/prefecture.rb

@@ -1,5 +1,3 @@
-# coding: UTF-8
-
 module Prefecture
 
   PREFECTURES = {

data/lib/tasks/resque.rake

@@ -6,30 +6,14 @@ namespace :dad do
 
     desc "Resqueをインストールします。"
     task :install => :environment do
-      rails_root = ENV['RAILS_ROOT'] || Rails.root
-      app_name = YAML.load_file("#{rails_root}/config/database.yml")[Rails.env]['database']
-
-      script = <<-EOF
-#!/bin/bash
-
-export APP_NAME=#{app_name}
-export RAILS_ROOT=#{rails_root}
-export RAILS_ENV=#{Rails.env}
-export NUM_WORKERS=1
-erb -T - #{File.join(File.dirname(__FILE__), 'resque.erb')} > tmp/#{app_name}.god 
-
-sudo mkdir -p /etc/god
-sudo cp -f tmp/#{app_name}.god /etc/god/#{app_name}.god
-sudo chown -R root:root /etc/god
-sudo chmod 755 /etc/god
-sudo chmod -R 644 /etc/god/*
-
-sudo /etc/init.d/god restart
-EOF
-
-      tmpfile = File.join(Rails.root, 'tmp', 'dad-resque-install-' + Daddy::Utils::StringUtils.current_time + '.sh')
-      File.write(tmpfile, ERB.new(script).result)
-      fail unless system("bash #{tmpfile}")
+      template = File.join(File.dirname(__FILE__), 'resque', 'app.god.erb')
+      config = File.join('tmp', "#{app_name}.god")
+      render(template, :to => config)
+
+      template = File.join(File.dirname(__FILE__), 'resque', 'install.sh.erb')
+      script = File.join('tmp', 'resque-install.sh')
+      render(template, :to => script)
+      fail unless system("bash -ex #{script}")
     end
 
   end

data/lib/tasks/{resque.erb → resque/app.god.erb}

@@ -1,12 +1,7 @@
 <%
-app_name   = ENV['APP_NAME']
-rails_env  = ENV['RAILS_ENV']
-rails_root = ENV['RAILS_ROOT']
-user       = ENV['USER']
-num_workers = ENV['NUM_WORKERS']
+user        = ENV['USER']
+num_workers = ENV['NUM_WORKERS'] || 1
 -%>
-# coding: UTF-8
-
 <%= num_workers %>.times do |num|
   God.watch do |w|
     w.dir      = "<%= rails_root %>"

data/lib/tasks/resque/install.sh.erb

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+sudo mkdir -p /etc/god
+sudo cp -f tmp/<%= app_name %>.god /etc/god/<%= app_name %>.god
+sudo chown -R root:root /etc/god
+sudo chmod 755 /etc/god
+sudo chmod -R 644 /etc/god/*
+
+if [ -e /var/run/god.pid ]; then
+  sudo /etc/init.d/god restart
+else
+  sudo /etc/init.d/god start
+fi

data/lib/tasks/task_helper.rb

@@ -15,4 +15,8 @@ end
 
 def self.template_dir
   File.join(File.dirname(File.dirname(File.dirname(__FILE__))), 'templates')
+end
+
+def self.render(template, options = {})
+  File.write(options[:to], ERB.new(File.read(template), 0, '-').result)
 end

data/lib/tax.rb

@@ -1,5 +1,3 @@
-# coding: UTF-8
-
 module Tax
 
   # 消費税区分

data/templates/Gemfile.erb

@@ -4,7 +4,7 @@ source 'https://rubygems.org'
 gem 'rails', '<%= RAILS_VERSION %>'
 
 gem 'coffee-rails', '~> 4.0.0'
-gem 'daddy', '~> 0.3'
+gem 'daddy', '~> 0.3.0'
 gem 'jbuilder', '~> 1.2'
 gem 'jquery-rails'
 gem 'mysql2'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daddy
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.6
 platform: ruby
 authors:
 - ichy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-23 00:00:00.000000000 Z
+date: 2014-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -180,9 +180,6 @@ dependencies:
   name: rails-i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 3.2.0
     - - <
       - !ruby/object:Gem::Version
         version: 5.0.0
@@ -190,9 +187,6 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 3.2.0
     - - <
       - !ruby/object:Gem::Version
         version: 5.0.0
@@ -356,8 +350,9 @@ files:
 - lib/tasks/phantomjs.rake
 - lib/tasks/publish.rake
 - lib/tasks/redis.rake
-- lib/tasks/resque.erb
 - lib/tasks/resque.rake
+- lib/tasks/resque/app.god.erb
+- lib/tasks/resque/install.sh.erb
 - lib/tasks/task_helper.rb
 - lib/tasks/tesseract.rake
 - lib/tasks/test.rake