Merge pull request #46 from takkii/develop

Update.

Author: takkii

lib/database.rb

@@ -5,27 +5,6 @@
 
 # Installer runner.
 class InstallerRunner
-  # default encoding utf-8, change encode here.
-  def self.encoding_style
-    Encoding.default_internal = 'UTF-8'
-    Encoding.default_external = 'UTF-8'
-  end
-  
-  def self.postgresql
-    if system('git clone git@github.com:takkii/nyasocom_pg.git', exception: true)
-    else
-      system('git clone https://github.com:takkii/nyasocom_pg.git')
-    end
-    FileUtils.cd("./nyasocom_pg")
-    FileUtils.rm_rf("./.git")
-    FileUtils.rm_rf("./.github")
-    puts <<-EOF
-
-Cloned nyasocom_pg with nyasocom_frame.
-
-EOF
-  end
-
   def self.run
     encoding_style
     two = ARGV[1]
@@ -51,6 +30,27 @@ def self.run
       puts 'No such option is found, please refer to the documentation.'
     end
   end
+  
+  private
+  def self.encoding_style
+    Encoding.default_internal = 'UTF-8'
+    Encoding.default_external = 'UTF-8'
+  end
+  
+  def self.postgresql
+    if system('git clone git@github.com:takkii/nyasocom_pg.git', exception: true)
+    else
+      system('git clone https://github.com:takkii/nyasocom_pg.git')
+    end
+    FileUtils.cd("./nyasocom_pg")
+    FileUtils.rm_rf("./.git")
+    FileUtils.rm_rf("./.github")
+    puts <<-EOF
+
+Cloned nyasocom_pg with nyasocom_frame.
+
+EOF
+  end
 end
 
 begin

lib/download.rb

@@ -5,21 +5,30 @@
 
 # Installer runner.
 class InstallerRunner
-  # default encoding utf-8, change encode here.
-  def self.encoding_style
-    Encoding.default_internal = 'UTF-8'
-    Encoding.default_external = 'UTF-8'
-  end
-
   def self.run
     encoding_style
+    nyasocom_command
+  end
+  
+  private
+  def self.nyasocom_command
     if system('git clone git@github.com:takkii/nyasocom_oss.git', exception: true)
     else
       system('git clone https://github.com:takkii/nyasocom_oss.git')
     end
     FileUtils.cd("./nyasocom_oss")
     FileUtils.rm_rf("./.git")
     FileUtils.rm_rf("./.github")
+    puts <<-EOF
+
+Cloned nyasocom_oss with nyasocom_frame.
+
+EOF
+  end
+
+  def self.encoding_style
+    Encoding.default_internal = 'UTF-8'
+    Encoding.default_external = 'UTF-8'
   end
 end
 

lib/frame.rb

@@ -17,20 +17,10 @@ def version
 
   def installer
     require 'install'
-    puts <<-EOF
-
-Used nyasocom_frame to clone nyasocom_oss with any project name.
-
-EOF
   end
 
-  def download
+  def downloader
     require 'download'
-    puts <<-EOF
-
-Cloned nyasocom_oss with nyasocom_frame.
-
-EOF
   end
 
   def databases
@@ -42,7 +32,7 @@ def default
     puts str
   end
 
-  def document
+  def documents
     puts text = <<-EOS
 # Nyasocom Framework information
 heat
@@ -80,9 +70,9 @@ def document
 if one.nil?
   default
 elsif one.match?(h)
-  document
+  documents
 elsif one.match?(i)
-  download
+  downloader
 elsif one.match?(n)
   installer
 elsif one.match?(v)

lib/frame/version.rb

@@ -5,7 +5,7 @@
 begin
 # nyasocom_frame version = x.x.x-xxxx.xx.xx
 module Frame
-  frame_version = '1.0.9'
+  frame_version = '1.0.10'
   t = Date.today
   build_day = t.strftime('%Y.%m.%d')
   VERSION = "#{frame_version}-#{build_day}".freeze

lib/install.rb

@@ -5,14 +5,19 @@
 
 # Installer runner.
 class InstallerRunner
-  # default encoding utf-8, change encode here.
+
+  def self.run
+    encoding_style
+    nyasocom_custom_name
+  end
+  
+  private
   def self.encoding_style
     Encoding.default_internal = 'UTF-8'
     Encoding.default_external = 'UTF-8'
   end
-
-  def self.run
-    encoding_style
+  
+  def self.nyasocom_custom_name
     one = ARGV[1]
     FileUtils.mkdir_p("./#{one}")
     FileUtils.cd("./#{one}")
@@ -22,6 +27,11 @@ def self.run
     end
     FileUtils.rm_rf("./.git")
     FileUtils.rm_rf("./.github")
+        puts <<-EOF
+
+Used nyasocom_frame to clone nyasocom_oss with any project name.
+
+EOF
   end
 end