weapon 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cbb48909536dc3a3318516c7b602448b78b7215e
-  data.tar.gz: 18524a55d5703272972842ebd49fec2a6d620d50
+  metadata.gz: fea6c2404fdb5d642557f968cce45b233c2a0648
+  data.tar.gz: b7804c55f63137bcaff47d9624d2915d3f0d6763
 SHA512:
-  metadata.gz: 5e06e4e03473ee62432d5a802d79d545aae66a7aeb6b70105587a8eff1a5b9e04e07b2bd71de11ecf275a1a335d2a1852bcc00b8d0cdc51093f0d8496690757f
-  data.tar.gz: 9260271d0c29c2e43889e3e61336041b39743d568b9e2c5e143055df912cf53ff81f472a285e42db1c5c91793df5ce259bdd8a02c78930e5622e17285de55983
+  metadata.gz: 2249aea23c0d36d712c49baae468cfff60b97f72e4a32ccf6d0866ccb5b7a454429651c7f2dbdb0bc62957d4031dee1d987d9ab779ca925b6b81ae97d5d7355a
+  data.tar.gz: 53eb483388d689b35de8b84c37dd744295ce254265c57a8ffe89628bbb11b3e5b274f7b3485d634b1cddaf867be1540873c4e9684b5e32a2d0d06ea795c25346

data/lib/weapon.rb

@@ -8,20 +8,32 @@ class Weapon < Thor
     File.dirname(__FILE__)
   end
 
-  desc "makesure_in_git", "makesure all the files is in git version control"
-  def makesure_in_git
-    run "spring stop"
-    unless (run "git remote -v")
-      puts "this project should in version controll use git"
-      run "git init"
-      run "git add *"
-      run "git commit -a -m 'first commit'"
+  no_commands do
+    def makesure_in_git
+      #run "spring stop"
+      unless (run "git remote -v")
+        puts "this project should in version controll use git"
+        run "git init"
+        run "git add *"
+        run "git commit -a -m 'first commit'"
+      end
     end
+
+    def config_bootstrap
+      File.open("Gemfile", "a").write("\ngem 'bootstrap-sass'")
+      run "bundle"
+      #config bootstrap stylesheets
+      File.open('app/assets/javascripts/application.js', 'a') { |f| f.write("\n//= require bootstrap-sprockets")}
+      File.open('app/assets/stylesheets/application.scss', 'a') { |f| f.write("\n@import 'bootstrap-sprockets';\n@import 'bootstrap';") }
+      run "rm app/assets/stylesheets/application.css"
+    end
+
   end
 
+
   desc "setup_mina_deploy", "setup mina deploy"
   def setup_mina_deploy
-    invoke :makesure_in_git
+    makesure_in_git
     puts "setup mina deploy"
     run "mina init"
     username = ask("input your user name on deploy host:")
@@ -32,8 +44,9 @@ class Weapon < Thor
     directory = directory.gsub(/\/$/, "")
     gsub_file "config/deploy.rb", "/var/www/foobar.com", directory
 
-    repository = ask("input your git remote url to pull from, like git@github.com:seaify/weapon.git ")
-    gsub_file "config/deploy.rb", "git://...", repository
+    default_repo = `git remote -v`.split(' ')[1]
+    repository = ask("input your git remote url to pull from, default #{default_repo} ")
+    gsub_file "config/deploy.rb", "git://...", (repository != "")?repository: default_repo
 
     setup_dir_command = 'ssh ' + username + '@' + domain + " -t 'mkdir -p " + directory  + ';chown -R ' + username + ' ' + directory + "'"
     run setup_dir_command
@@ -45,7 +58,7 @@ class Weapon < Thor
 
   desc "setup_settings_ui", "setup settings ui"
   def setup_settings_ui
-    invoke :makesure_in_git
+    makesure_in_git
     #inject_into_file "Gemfile", "gem 'rails-settings-ui', '~> 0.3.0'\n gem 'rails-settings-cached', '0.4.1'\n", :before => /^end/
     File.open("Gemfile", "a").write("\ngem 'rails-settings-ui', '~> 0.3.0'\n gem 'rails-settings-cached', '0.4.1'\n")
     run "bundle"
@@ -58,7 +71,7 @@ class Weapon < Thor
 
   desc "custom_i18n", "custom i18n and use slim as template engine, use simple_form, currently write to zh-CN.yml"
   def custom_i18n
-    invoke :makesure_in_git
+    makesure_in_git
     puts "custom i18n"
     File.open("Gemfile", "a").write("\ngem 'slim-rails'\ngem 'simple_form', '~> 3.1.0'")
     run "bundle"
@@ -67,7 +80,7 @@ class Weapon < Thor
       copy_file 'support/custom_i18n/zh-CN.yml', 'config/locales/zh-CN.yml'
     end
 
-    invoke :config_bootstrap
+    config_bootstrap
     run "rails g simple_form:install --bootstrap"
     copy_file 'support/custom_i18n/_form.html.slim', 'lib/templates/slim/scaffold/_form.html.slim'
     copy_file 'support/custom_i18n/index.html.slim', 'lib/templates/slim/scaffold/index.html.slim'
@@ -87,19 +100,9 @@ class Weapon < Thor
     run "rails g simple_form:install --bootstrap"
   end
 
-  desc "config_bootstrap", "config bootstrap, example, used for simmple_form"
-  def config_bootstrap
-    File.open("Gemfile", "a").write("\ngem 'bootstrap-sass'")
-    run "bundle"
-    #config bootstrap stylesheets
-    File.open('app/assets/javascripts/application.js', 'a') { |f| f.write("\n//= require bootstrap-sprockets")}
-    File.open('app/assets/stylesheets/application.scss', 'a') { |f| f.write("\n@import 'bootstrap-sprockets';\n@import 'bootstrap';") }
-    run "rm app/assets/stylesheets/application.css"
-  end
-
   desc "push_to_github", "push to github"
   def push_to_github
-    invoke :makesure_in_git
+    makesure_in_git
     puts "pull to github"
     run 'gem install hub'
     run "hub create #{File.basename(Dir.getwd)}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: weapon
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Chuck.lei
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-15 00:00:00.000000000 Z
+date: 2015-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec