bin_install 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c29e26bb5737ae53deff07492b5452de425c756d126f401c238b0a4adadc01d
-  data.tar.gz: 6c71e63364358f4da49b67ff8143a1738afb786f268c794a0447c923170091d8
+  metadata.gz: cf520e85a67139400ac80332f8c75edcc4d3963670c88befc29e2f18add01ce2
+  data.tar.gz: 5290b4fd34eed30a1f53e77008dd05e3386b0841b4f38eb7fc966004d2dbd71c
 SHA512:
-  metadata.gz: 0233347fd71b898c6ef0ca06ecf05b1ec159eee95e6568605088d5c0204d451ca64be511b9a2f82a8a4d3c301d895a796f509381b3bf90e3e85b6aeaf0b1d83d
-  data.tar.gz: 3d43d6244065d624f2a41105027eca98131cb1e6ea6d8f6186b907062974165f72c4c9c55437f865ce367beefd202e9005f564fb8fe0a0974d803954eafdf31e
+  metadata.gz: 0d42687f1281e5b05564ad718f5c328ff6b61ca9b2100b11c5b96ad5d950d6b4b0bae1b0d1282363ed12a128c21e00063568082265780942242c51867657a9ee
+  data.tar.gz: 983e45d53b549124507dc7d8b1a5c793fc692f10fdd1a0ccf1d672d2b9b0a7d933c21152b008805475514adf171be8b3ebe7da903176a938d35d0075d77320a4

data/README.md

@@ -136,11 +136,11 @@ Install [Redis](https://redis.io/) with:
 
     BinInstall::Redis.install # or install!
 
-### RubyEnvironmentManager
+### Ruby
 
 Install [rbenv](https://github.com/rbenv/rbenv) unless [RVM](https://rvm.io/) is installed with:
 
-    BinInstall::RubyEnvironmentManager.install # or install!
+    BinInstall::Ruby.install # or install!
 
 ### Server
 

data/lib/bin_install/rails.rb

@@ -1,25 +1,33 @@
 module BinInstall
   module Rails
-    def self.db_setup
+    def self.db_setup(environment = 'development')
       puts 'Preparing database...'.white
-      rails_or_rake('db:setup')
-      rails_or_rake!('db:setup RAILS_ENV=test')
+      rails_or_rake("db:setup RAILS_ENV=#{environment}")
     end
 
-    def self.db_setup!
+    def self.db_setup!(environment = 'development')
       puts 'Preparing database...'.white
-      rails_or_rake!('db:setup')
-      rails_or_rake!('db:setup RAILS_ENV=test')
+      rails_or_rake!("db:setup RAILS_ENV=#{environment}")
     end
 
-    def self.db_migrate
+    def self.db_migrate(environment = 'development')
       puts 'Migrating database...'.white
-      rails_or_rake('db:migrate')
+      rails_or_rake("db:migrate RAILS_ENV=#{environment}")
     end
 
-    def self.db_migrate!
+    def self.db_migrate!(environment = 'development')
       puts 'Migrating database...'.white
-      rails_or_rake!('db:migrate')
+      rails_or_rake!("db:migrate RAILS_ENV=#{environment}")
+    end
+
+    def self.db_reset(environment = 'development')
+      puts 'Resetting database...'.white
+      rails_or_rake("db:reset RAILS_ENV=#{environment}")
+    end
+
+    def self.db_reset!(environment = 'development')
+      puts 'Resetting database...'.white
+      rails_or_rake!("db:reset RAILS_ENV=#{environment}")
     end
 
     def self.clear

data/lib/bin_install/{ruby_environment_manager → ruby}/rbenv.rb

@@ -1,5 +1,5 @@
 module BinInstall
-  module RubyEnvironmentManager
+  module Ruby
     module Rbenv
       def self.install
         if installed?
@@ -52,11 +52,11 @@ module BinInstall
       end
 
       def self.install_ruby(version = nil)
-        version ||= RubyEnvironmentManager.required_ruby_version
+        version ||= Ruby.required_ruby_version
         puts "Installing Ruby #{version}...".white
 
         if version
-          if RubyEnvironmentManager.ruby_version_installed?(version)
+          if Ruby.ruby_version_installed?(version)
             puts "Ruby #{version} is already installed. Skipping.".blue
           else
             system("rbenv install #{version}")
@@ -68,11 +68,11 @@ module BinInstall
       end
 
       def self.install_ruby!(version = nil)
-        version ||= RubyEnvironmentManager.required_ruby_version
+        version ||= Ruby.required_ruby_version
         puts "Installing Ruby #{version}...".white
 
         if version
-          if RubyEnvironmentManager.ruby_version_installed?(version)
+          if Ruby.ruby_version_installed?(version)
             puts "Ruby #{version} is already installed. Skipping.".blue
           else
             BinInstall.system!("rbenv install #{version}")

data/lib/bin_install/{ruby_environment_manager → ruby}/rvm.rb

@@ -1,8 +1,8 @@
 module BinInstall
-  module RubyEnvironmentManager
+  module Ruby
     module Rvm
       def self.install_ruby(version = nil)
-        version ||= RubyEnvironmentManager.required_ruby_version
+        version ||= Ruby.required_ruby_version
 
         if version
           system("rvm install #{version}")
@@ -13,7 +13,7 @@ module BinInstall
       end
 
       def self.install_ruby!(version = nil)
-        version ||= RubyEnvironmentManager.required_ruby_version
+        version ||= Ruby.required_ruby_version
 
         if version
           BinInstall.system!("rvm install #{version}")

data/lib/bin_install/ruby.rb

@@ -0,0 +1,18 @@
+require 'bin_install/ruby/rbenv'
+require 'bin_install/ruby/rvm'
+
+module BinInstall
+  module Ruby
+    def self.required_ruby_version
+      Dir.chdir(Dir.pwd) { `cat .ruby-version` }
+    end
+
+    def self.ruby_version
+      Dir.chdir(Dir.pwd) { `ruby --version` }
+    end
+
+    def self.ruby_version_installed?(version)
+      ruby_version.start_with?("ruby #{version}")
+    end
+  end
+end

data/lib/bin_install/version.rb

@@ -1,3 +1,3 @@
 module BinInstall
-  VERSION = '0.0.14'.freeze
+  VERSION = '0.0.15'.freeze
 end

data/lib/bin_install.rb

@@ -9,7 +9,7 @@ require 'bin_install/node'
 require 'bin_install/postgres'
 require 'bin_install/rails'
 require 'bin_install/redis'
-require 'bin_install/ruby_environment_manager'
+require 'bin_install/ruby'
 require 'bin_install/server'
 require 'bin_install/shell'
 require 'bin_install/version'

data/lib/generators/bin_install/templates/install

@@ -6,7 +6,7 @@ APP_ROOT = File.expand_path('..', __dir__)
 Dir.chdir(APP_ROOT) do
   BinInstall::Brew.require!
   BinInstall::OhMyZsh.install
-  BinInstall::RubyEnvironmentManager.install
+  BinInstall::Ruby.install
   BinInstall::Postgres.install
   BinInstall::Postgres.create_superuser('postgres')
   BinInstall::Gem.install!

data/lib/generators/bin_install/templates/update

@@ -6,6 +6,7 @@ APP_ROOT = File.expand_path('..', __dir__)
 Dir.chdir(APP_ROOT) do
   BinInstall::Gem.install!
   BinInstall::Yarn.install
-  BinInstall::Rails.db_migrate
+  BinInstall::Rails.db_migrate('development')
+  BinInstall::Rails.db_migrate('test')
   BinInstall::Rails.clear
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bin_install
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - David Singer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-08 00:00:00.000000000 Z
+date: 2018-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -129,9 +129,9 @@ files:
 - lib/bin_install/postgres.rb
 - lib/bin_install/rails.rb
 - lib/bin_install/redis.rb
-- lib/bin_install/ruby_environment_manager.rb
-- lib/bin_install/ruby_environment_manager/rbenv.rb
-- lib/bin_install/ruby_environment_manager/rvm.rb
+- lib/bin_install/ruby.rb
+- lib/bin_install/ruby/rbenv.rb
+- lib/bin_install/ruby/rvm.rb
 - lib/bin_install/server.rb
 - lib/bin_install/shell.rb
 - lib/bin_install/version.rb

data/lib/bin_install/ruby_environment_manager.rb

@@ -1,61 +0,0 @@
-require 'bin_install/ruby_environment_manager/rbenv'
-require 'bin_install/ruby_environment_manager/rvm'
-
-module BinInstall
-  module RubyEnvironmentManager
-    def self.install
-      if RubyEnvironmentManager::Rvm.installed?
-        puts 'RVM is already installed. Skipping rbenv install.'.blue
-      else
-        RubyEnvironmentManager::Rbenv.install
-      end
-
-      install_ruby
-    end
-
-    def self.install!
-      if RubyEnvironmentManager::Rvm.installed?
-        puts 'RVM is already installed. Skipping rbenv install.'.blue
-      else
-        RubyEnvironmentManager::Rbenv.install!
-      end
-
-      install_ruby!
-    end
-
-    def self.install_ruby(version = nil)
-      case find_environment_manager!
-      when :rbenv then RubyEnvironmentManager::Rbenv.install_ruby(version)
-      when :rvm then RubyEnvironmentManager::Rvm.install_ruby(version)
-      end
-    end
-
-    def self.install_ruby!(version = nil)
-      case find_environment_manager!
-      when :rbenv then RubyEnvironmentManager::Rbenv.install_ruby(version)
-      when :rvm then RubyEnvironmentManager::Rvm.install_ruby(version)
-      end
-    end
-
-    def self.required_ruby_version
-      Dir.chdir(Dir.pwd) { `cat .ruby-version` }
-    end
-
-    def self.ruby_version
-      Dir.chdir(Dir.pwd) { `ruby --version` }
-    end
-
-    def self.ruby_version_installed?(version)
-      ruby_version.start_with?("ruby #{version}")
-    end
-
-    def self.find_environment_manager
-      return :rbenv if RubyEnvironmentManager::Rbenv.installed?
-      return :rvm if RubyEnvironmentManager::Rvm.installed?
-    end
-
-    def self.find_environment_manager!
-      find_environment_manager || abort('No Ruby environment manager found.'.red)
-    end
-  end
-end