strap 0.0.4 → 0.0.5

data/lib/strap/cli.rb

@@ -7,7 +7,7 @@ module Strap
     desc "install", "Create '~/.strap' templates directory"
     def install
       if File.exists?(File.expand_path('~/.strap')) 
-        say "'~/.strap' directory already exists\n", :red
+        say "'~/.strap' directory already exists", :red
       else
         Dir::mkdir(File.expand_path('~/.strap'))
         FileUtils.cp(CONFIG_TEMPLATE, File.expand_path('~/.strap/default'))
@@ -18,23 +18,22 @@ module Strap
     desc "init PATH", "Initialize a new project directory at PATH and generate Strapfile"
     method_option :template, :aliases => "-t", :desc => "Specify a template Strapfile from '~/.strap'"
     def init(path)
-      say ""
       if File.exists?(path)
-        say "That directory already exists\n", :red
+        say "That directory already exists", :red
       else
         template = options[:template]
         core = Strap::Core.new(self)
         core.create_project_directory(path)
         core.create_config(path, template)
         core.update_database_name(path)
-        say "\nStrap project created. Now edit the Strapfile and run 'strap go' from the project directory to bootstrap your project.\n\n"
+        say "Strap project created. Now edit the Strapfile and run 'strap go' from the project directory to bootstrap your project."
       end
     end
 
     desc "go", "Bootstrap the project: clone bootstrap repo, create database, make first commit to project repo"
     def go(strapfile = "Strapfile")
       unless File.exists?(strapfile)
-        say "\nNo Strapfile in current directory. Use the 'strap init PATH' command first to setup your project directory and to initialize a Strapfile.\n", :red
+        say "No Strapfile in current directory. Use the 'strap init PATH' command first to setup your project directory and to initialize a Strapfile.", :red
         return false
       end
       config = Strap::Config.new(strapfile)

data/lib/strap/core.rb

@@ -44,7 +44,7 @@ module Strap
     end
     
     def clone_repo(repo, directory=".")
-      if !repo.empty? && !File.exists?("#{directory}/.git")
+      if !repo.nil? && !File.exists?("#{directory}/.git")
         output "- Cloning source repo"
         clone = system("cd #{directory} && git clone #{repo} strap_temp")
         unless clone
@@ -63,7 +63,7 @@ module Strap
     end
     
     def commit_to_repo(repo, directory=".", force=false)
-      if !repo.empty?
+      if !repo.nil?
         commit = system("cd #{directory} && git init . && git add -A && git commit -m 'Initial commit from Strap'")
         if commit
           output "- Git repo initialized"
@@ -82,7 +82,7 @@ module Strap
     end
     
     def create_database(db_user, db_password, db_socket=nil, db_name=nil, db_port=nil, db_host=nil)
-      if db_user.empty? and db_password.empty? and db_name.empty?
+      if db_user.nil? and db_password.nil? and db_name.nil?
         return false
       end
       mysql = Mysql::new(db_host, db_user, db_password, nil, db_port, db_socket)
@@ -97,7 +97,7 @@ module Strap
     end
     
     def import_to_database(sql, db_user, db_password, db_socket=nil, db_name=nil, db_port=nil, db_host=nil)
-      if db_user.empty? and db_password.empty? and db_name.empty? and sql.empty?
+      if db_user.nil? and db_password.nil? and db_name.nil? and sql.nil?
         return false
       end
       import = system("mysql -u#{db_user} -p#{db_password} -S#{db_socket} #{db_name} < #{sql}")

data/lib/strap/version.rb

@@ -1,3 +1,3 @@
 module Strap
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: strap
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-12 00:00:00.000000000 Z
+date: 2012-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake