daddy 0.5.31 → 0.5.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c0d7f9efe640da543b365fefac97aaca91480d8
-  data.tar.gz: 8716d3064cf35f21ef8a84060e6038918305aae1
+  metadata.gz: 4a1e7094fadb79cb8e63f11b1cf31ae78e3b419c
+  data.tar.gz: d10a84611f3f60d6bb90670018c9933ac4156e17
 SHA512:
-  metadata.gz: 7111d8fef60d85083567ac4481378798c670e92b3d4761eb33d4408630611bda623a868c2b9eeed1f4347c49fd6794646430aad42a675150840f6ab8b6d8ce60
-  data.tar.gz: 59df049ad22948dbe87517745cd1e7787f59a424936b14ed787bb396f290019dc29d8361dac5f88c3fc3d6544956e21700baaa50733cec7af15f4a7c40905a63
+  metadata.gz: bc2e7404057a351ece154bfe878525b60f83db14f9a84ede472c5da091fb412b0d509d112e0fd696bca23620bfe6e1fba853b8734a96ae5f7b3e6d0ab475a075
+  data.tar.gz: 841fac960968c721711503588cf914f025dcd405b8eef2c8724e59194ba1a62d94610e22067cac25dfa8ce59658c4db067cdd33f1c4693c14dd40ebaf02dcda9

data/itamae/cookbooks/trac/install.rb

@@ -8,8 +8,16 @@ package 'python-devel' do
   user 'root'
 end
 
-execute 'pip install trac==1.2.2 mysql-python' do
-  user 'root'
+{
+  'Trac': '1.2.2',
+  'MySQL-python': nil,
+  'trac-github': nil,
+  'requests-oauthlib': nil
+}.each do |name, version|
+  execute "pip install #{name}" do
+    user 'root'
+    not_if "pip list --format=freeze | egrep '#{name}==#{version ? version : '.*'}'"
+  end
 end
 
 directory '/var/apps' do
@@ -24,4 +32,12 @@ directory '/var/apps/trac' do
   owner ENV['USER']
   group ENV['USER']
   mode '755'
-end
+end
+
+template '/etc/systemd/system/tracd.service' do
+  user 'root'
+  owner 'root'
+  group 'root'
+  mode '644'
+  variables :user => ENV['USER'], :group => ENV['USER'], :port => 8082
+end

data/itamae/templates/etc/systemd/system/tracd.service.erb

@@ -0,0 +1,14 @@
+[Unit]
+Description=tracd
+Wants=network-online.target
+After=network-online.target
+
+[Service]
+ExecStart=/usr/bin/tracd -p <%= @port %> -e /var/apps/trac/
+
+User=<%= @user %>
+Group=<%= @group %>
+StandardOutput=syslog
+
+[Install]
+WantedBy=multi-user.target

data/lib/daddy/uploader.rb

@@ -1,6 +1,4 @@
-require 'carrierwave'
-
-CarrierWave::SanitizedFile.sanitize_regexp = /[^[:word:]\.\-\+]/
+CarrierWave::SanitizedFile.sanitize_regexp = /[^[:print:]]/
 
 CarrierWave.configure do |config|
   config.root = 
@@ -9,6 +7,25 @@ CarrierWave.configure do |config|
     else
       "/data/#{::Rails.application.class.parent_name.underscore}/#{::Rails.env}"
     end
+
+  unless ::Rails.env.test?
+    if File.exists?('config/aws.yml')
+      require 'carrierwave/storage/fog'
+      config.storage :fog
+      config.cache_storage :fog
+  
+      config.fog_provider = 'fog/aws'
+      aws = YAML.load_file('config/aws.yml')
+  
+      config.fog_credentials = {
+        provider: 'AWS',
+        aws_access_key_id: aws['s3']['access_key_id'],
+        aws_secret_access_key: aws['s3']['secret_access_key'],
+        region: aws['s3']['region']
+      }
+      config.fog_directory = aws['s3']['bucket']
+    end
+  end
 end
 
 module Daddy

data/lib/daddy/version.rb

@@ -1,3 +1,3 @@
 module Daddy
-  VERSION = '0.5.31'
+  VERSION = '0.5.32'
 end

data/lib/tasks/dad.rake

@@ -7,9 +7,3 @@ task :dad do
     end
   end
 end
-
-namespace :dad do
-  task :install do
-    system('rake dad:cucumber:install')
-  end
-end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daddy
 version: !ruby/object:Gem::Version
-  version: 0.5.31
+  version: 0.5.32
 platform: ruby
 authors:
 - ichy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-03 00:00:00.000000000 Z
+date: 2017-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -306,6 +306,7 @@ files:
 - itamae/templates/etc/nginx/conf.d/default.conf.erb
 - itamae/templates/etc/nginx/nginx.conf.erb
 - itamae/templates/etc/sysconfig/jenkins.erb
+- itamae/templates/etc/systemd/system/tracd.service.erb
 - itamae/templates/etc/vsftpd/vsftpd.conf.erb
 - itamae/templates/etc/yum.repos.d/docker.repo.erb
 - itamae/templates/etc/yum.repos.d/nginx.repo.erb
@@ -316,7 +317,6 @@ files:
 - lib/daddy/cucumber.rb
 - lib/daddy/cucumber/helpers.rb
 - lib/daddy/cucumber/helpers/assert.rb
-- lib/daddy/cucumber/helpers/diff.rb
 - lib/daddy/cucumber/helpers/html.rb
 - lib/daddy/cucumber/helpers/pause.rb
 - lib/daddy/cucumber/helpers/puts.rb
@@ -355,7 +355,6 @@ files:
 - lib/daddy/version.rb
 - lib/sql_builder.rb
 - lib/tasks/app_base_dir.rake
-- lib/tasks/cucumber_install.rake
 - lib/tasks/cucumber_steps.rake
 - lib/tasks/dad.rake
 - lib/tasks/db/database.yml.erb

data/lib/daddy/cucumber/helpers/diff.rb

@@ -1,125 +0,0 @@
-# coding: UTF-8
-
-module Daddy
-  module Cucumber
-    module Diff
-      
-      def git_diff(file, options = {})
-        options[:as] = 'edit' unless options.has_key?(:as)
-        remote = options.has_key?(:remote) ? options[:remote] : true 
-
-        git = Daddy::Git.new
-        
-        if options[:between]
-          a = git.show_previous(file, :commit => options[:between], :remote => remote)
-        else
-          a = File.read(file)
-        end
-        a = a.gsub(/[<>]/, '<' => '&lt;', '>' => '&gt;')
-
-        if options[:and]
-          b = git.show_previous(file, :commit => options[:and], :remote => remote)
-        else
-          b = git.show_previous(file, :remote => remote)
-        end
-        b = b.gsub(/[<>]/, '<' => '&lt;', '>' => '&gt;')
-
-        diff = format_diff(Differ.diff(a, b), options)
-
-        show_filename(file, options)
-        puts "<pre>#{diff}</pre>"
-      end
-
-      def git_diff_name(*includes)
-        git = Daddy::Git.new
-        puts '<pre>' + git.git_diff_name(*includes) + '</pre>'
-      end
-      
-      def diff(file_a, file_b, options = {})
-        a = File.read(file_a).gsub(/[<>]/, '<' => '&lt;', '>' => '&gt;')
-        b = File.read(file_b).gsub(/[<>]/, '<' => '&lt;', '>' => '&gt;')
-        diff = format_diff(Differ.diff(a, b))
-
-        show_filename(file_a, options)
-        puts "<pre>#{diff}</pre>"
-      end
-
-      def show(file, options = {})
-        show_filename(file, options)
-
-        if options[:commit].present?
-          git = Daddy::Git.new
-          content = git.show_previous(file, :commit => options[:commit], :remote => options[:remote])
-          lines = content.split(/\r\n|\r|\n/).map{|line| line + "\n"}
-        else
-          lines = File.readlines(file)
-        end
-
-        if options[:from] and options[:to]
-          from = options[:from] - 1
-          to = options[:to] - 1
-          lines = lines[from..to]
-        elsif options[:from]
-          from = options[:from] - 1
-          lines = lines[from..-1]
-        elsif options[:to]
-          to = options[:to] - 1
-          lines = lines[0..to]
-        end
-
-        lines = lines.join.gsub(/[<>]/, '<' => '&lt;', '>' => '&gt;')
-        puts "<pre>#{lines}</pre>"
-
-      end
-      
-      private
-      
-      def show_filename(filename, options = {})
-        labels = []
-        if options[:as].is_a?(String) or options[:as].is_a?(Symbol)
-          labels << options[:as]
-        elsif options[:as].is_a?(Array)
-          labels += options[:as]
-        end
-
-        html = "<span class=\"#{labels.join(' ')}\">"
-        labels.each do |label|
-          case label.to_s
-          when 'auto'
-            html << '[自動生成] '
-          when 'new'
-            html << '[新規作成] '
-          when 'edit'
-            html << '[編集] '
-          end
-        end
-        
-        html << filename
-        html << "</span>"
-
-        puts html
-      end
-      
-      def format_diff(diff, options = {})
-        diff_lines = diff.to_s.split("\n")
-
-        if options[:from] and options[:to]
-          from = options[:from] - 1
-          to = options[:to] - 1
-          diff_lines = diff_lines[from..to]
-        elsif options[:from]
-          from = options[:from] - 1
-          diff_lines = diff_lines[from..-1]
-        elsif options[:to]
-          to = options[:to] - 1
-          diff_lines = diff_lines[0..to]
-        end
-
-        diff_lines.join("\n")
-      end
-
-    end
-  end
-end
-
-World(Daddy::Cucumber::Diff)

data/lib/tasks/cucumber_install.rake

@@ -1,18 +0,0 @@
-require 'rake'
-
-namespace :dad do
-  namespace :cucumber do
-    task :install do
-      FileUtils.mkdir_p("features")
-      FileUtils.mkdir_p("features/step_definitions")
-      FileUtils.touch("features/step_definitions/.keep")
-
-      FileUtils.mkdir_p("features/support")
-      system("touch features/support/.keep")
-      File.write "features/support/env.rb", <<-EOF
-require 'rails'
-require 'daddy/cucumber'
-      EOF
-    end
-  end
-end