plastic_rails 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90f7872cb0a90ce249ef6032210d9ef6e9dd0a4fd4db2b451c4a4c95447d0d68
-  data.tar.gz: 98304d1e9bddeae78bf548697aac75804f5b6841443e8b7d450b48cfaff2f7b5
+  metadata.gz: 3f8a081cd7e8a090c7748843f22728bcd725a994e4c41b88ae5cb57c09a51a4a
+  data.tar.gz: b4d444d97a87883ccbe4ecfe4d51f902de0d8f896c1ebb1572b52a6cb5f3eb37
 SHA512:
-  metadata.gz: aff574d76f5ba7c0fa36cc8a29f01d6d5b64cd9dc48bbd18060fee392f78f65851ec71044e5ec892804322e75530fa6b7ac34aeb05b9025795f5261f51845b10
-  data.tar.gz: 04df7a51737a3d1f6b16290b0e01ba223ed8e80868fa3a687c1fb83a4319086c543161cd079ff7a2b45a1410fbd8c0c4be6c438b848e7ffb261b797ab9953c6b
+  metadata.gz: 168ee64f3cc86a4d6be86e1f876a20b5522b9e4bfcc5c3c7b73084bec3eaea3f010e12517481628b02f236cddd8fd9d0c8e6c163547589fa828dd89e300f16a8
+  data.tar.gz: 3a1df9fc486f4c73d90ac7456595207cabadac703812e6b7cbc268a1f5e83beedf9300e2cb31526ee6ae1e49a715080ab8162a79ec08403955c12209fbeb55aa

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    plastic_rails (0.1.4)
+    plastic_rails (0.1.5)
       thor (~> 1.0)
 
 GEM

data/lib/plastic_rails.rb

@@ -1,14 +1,18 @@
 require "thor"
 require "plastic_rails/version"
-require "plastic_rails/fileutils"
-  THOR_SILENCE_DEPRECATION = true
+THOR_SILENCE_DEPRECATION = true
 
 module PlasticRails
   class Error < StandardError; end
 
   class PlaRails < Thor
+    include Thor::Actions
     DEFAULT_TEMPLATE_DIR = File.join(File.dirname(__FILE__) , "tmpl")
 
+    def self.source_root
+      Dir.pwd
+    end
+
     def self.exit_on_failure?
       # コマンドが失敗したときに終了ステータス１を返すようにする設定
       true
@@ -18,52 +22,45 @@ module PlasticRails
     option :db_path, :default => "./db/mysql/volumes"
     option :template, :default => DEFAULT_TEMPLATE_DIR
     def new(appname)
-      execute("cp -a #{options[:template]} #{appname}")
-      Dir.chdir(appname)
-
-      # DBのファイルパスを設定する
-      FileUtils.sed("docker-compose.yml",/%DB_PATH%/,options[:db_path]) 
+      directory(options[:template], appname, :mode => :preserve)
+      inside(appname) do
+        # DBのファイルパスを設定する
+        gsub_file("docker-compose.yml", /%DB_PATH%/, options[:db_path]) 
 
-      # Dockerイメージビルド＆rails new (working_dirは `/apps`)
-      execute("./build.sh #{appname}")
+        # Dockerイメージビルド＆rails new (working_dirは `/apps`)
+        run("./build.sh #{appname}")
 
-      # working_dirをrailsアプリのディレクトリに変更する
-      FileUtils.sed("docker-compose.yml",/(working_dir: \/apps\/)/,'\1' + appname) 
+        # working_dirをrailsアプリのディレクトリに変更する
+        gsub_file("docker-compose.yml", /(working_dir: \/apps\/)/, '\1' + appname) 
 
-      # Railsアプリの設定（`bundle install`, `rails db:setup` など）
-      system("./setup.sh")
+        # Railsアプリの設定（`bundle install`, `rails db:setup` など）
+        run("./setup.sh")
+      end
     end
 
     desc "login", "Log in Rails container related to current directory."
     def login
-      execute("docker-compose exec web bash")
+      run("docker-compose exec web bash")
     end
 
     desc "up", "Start up Rails container related to current directory."
     def up
-      execute("docker-compose up -d")
+      run("docker-compose up -d")
     end
 
     desc "stop", "Stop Rails container related to current directory."
     def stop
-      execute("docker-compose stop")
+      run("docker-compose stop")
     end
 
     desc "down", "Stop and remove Rails container related to current directory."
     def down
-      execute("docker-compose down")
+      run("docker-compose down")
     end
 
     desc "copy_template [DEST_DIR]", "Copy the default template to any dir. (To use in `new` command with `--template` option.)"
     def copy_template(dest_dir)
-      execute("cp -a #{DEFAULT_TEMPLATE_DIR} #{dest_dir}")
-    end
-
-    private
-
-    def execute(cmd)
-      puts cmd
-      system(cmd)
+      directory(DEFAULT_TEMPLATE_DIR, dest_dir, :mode => :preserve)
     end
   end
 end

data/lib/plastic_rails/version.rb

@@ -1,3 +1,3 @@
 module PlasticRails
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/lib/tmpl/build.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 set -eu
 APPNAME=$1
-BUILD_CMD="docker-compose build --no-cache --build-arg APPNAME=$APPNAME"
+BUILD_CMD="docker-compose build --no-cache"
 RUN_ON_WEB_CMD="docker-compose run --rm web"
 OSTYPE=$(uname)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plastic_rails
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Koki Hashimoto
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-30 00:00:00.000000000 Z
+date: 2020-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -71,7 +71,6 @@ files:
 - bin/setup
 - exe/plastic_rails
 - lib/plastic_rails.rb
-- lib/plastic_rails/fileutils.rb
 - lib/plastic_rails/version.rb
 - lib/tmpl/Dockerfile
 - lib/tmpl/apps/.keep

data/lib/plastic_rails/fileutils.rb

@@ -1,12 +0,0 @@
-module FileUtils
-  def self.sed(file, pattern, replacement)
-    File.open(file, "r") do |f_in|
-      buf = f_in.read
-      buf.gsub!(pattern, replacement)
-      File.open(file, "w") do |f_out|
-        f_out.write(buf)
-      end
-    end
-  end
-end
-