gitpusshuten 0.0.3 → 0.0.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gitpusshuten (0.0.2)
+    gitpusshuten (0.0.3)
       activesupport (~> 3.0.0)
       highline (~> 1.6.0)
       json (~> 1.4.0)

data/README.md

@@ -1,4 +1,4 @@
-Git Pusshuten ( プッシュ点 )
+Git Pusshuten ( プッシュ天 )
 
 Heavenly Git-based (Application) Deployment!
 

data/lib/gitpusshuten/command.rb

@@ -108,7 +108,7 @@ module GitPusshuTen
     ##
     # Displays a list of available commands in the CLI
     def display_commands
-      puts "\nGit Pusshu Ten\n\s\s\s\sプッシュ点\n\n"
+      puts "\nGit Pusshu Ten\n\s\s\s\sプッシュ天\n\n"
       puts "[Aliases]\n\n"
       puts "\s\s#{y('gitpusshuten')}, #{y('heavenly')}, #{y('ten')}\n\n"
       puts "[Commands]\n\n"
@@ -122,7 +122,7 @@ module GitPusshuTen
     ##
     # Displays command specific details in the CLI
     def display_usage(command)
-      puts "\nGit Pusshu Ten\n\s\s\s\sプッシュ点\n\n"
+      puts "\nGit Pusshu Ten\n\s\s\s\sプッシュ天\n\n"
       puts "[Command]\n\n\s\s#{y(command)}\n\n"
       puts "[Description]\n\n\s\s#{get_constant_for(command).description}\n\n"
       puts "[Usage]\n\n\s\s#{y get_constant_for(command).usage}\n\n"

data/lib/gitpusshuten/commands/initialize.rb

@@ -2,9 +2,9 @@
 module GitPusshuTen
   module Commands
     class Initialize < GitPusshuTen::Commands::Base
-      description "Initializes Git Pusshu Ten (プッシュ点) with the working directory."
+      description "Initializes Git Pusshu Ten (プッシュ天) with the working directory."
       usage       "initialize"
-      example     "heavenly initialize  # Initializes Git Pusshu Ten (プッシュ点) with the working directory."
+      example     "heavenly initialize  # Initializes Git Pusshu Ten (プッシュ天) with the working directory."
 
       ##
       # Initialize specific attributes/arguments
@@ -24,7 +24,7 @@ module GitPusshuTen
       ##
       # Performs the Initialize command
       def perform!
-        message "Would you like to initialize Git Pusshu Ten (プッシュ点) with #{working_directory}?"
+        message "Would you like to initialize Git Pusshu Ten (プッシュ天) with #{working_directory}?"
         if yes?
           copy_templates!
           if not git.initialized?
@@ -41,7 +41,7 @@ module GitPusshuTen
       # to the .gitpusshuten inside the working directory
       def copy_templates!
         if File.directory?(File.join(working_directory, '.gitpusshuten'))
-          warning "Git Pusshu Ten (プッシュ点) is already initialized in #{y(working_directory)}."
+          warning "Git Pusshu Ten (プッシュ天) is already initialized in #{y(working_directory)}."
           warning "Re-initializing it will cause it to overwrite the current #{y("config.rb")} and #{y("hooks.rb")} files."
           warning "Are you sure you wish to continue?"
           @confirm_perform = yes?
@@ -52,7 +52,7 @@ module GitPusshuTen
           Dir[File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'templates', '*.rb'))].each do |template|
             local.execute("cp '#{template}' '#{working_directory}/.gitpusshuten/#{template.split('/').last}'")
           end
-          message "Git Pusshu Ten (プッシュ点) initialized in: #{y(working_directory)}!"
+          message "Git Pusshu Ten (プッシュ天) initialized in: #{y(working_directory)}!"
         end
       end
 

data/lib/gitpusshuten/commands/user.rb

@@ -25,9 +25,6 @@ module GitPusshuTen
       # Sets up a new UNIX user and configures it based on the .gitpusshuten/config.rb
       def perform_add!
         if not e.user_exists? # prompts root
-          ensure_git_installed!
-          ensure_common_dependencies_are_installed!
-          
           message "It looks like #{y(c.user)} does not yet exist."
           message "Would you like to add #{y(c.user)} to #{y(c.application)} (#{y(c.ip)})?"
           if yes?
@@ -49,6 +46,20 @@ module GitPusshuTen
           exit
         end
         
+        ##
+        # Install Git if it isn't installed yet
+        Spinner.return :message => "Ensuring #{y('Git')} is installed.." do
+          ensure_git_installed!
+          g('Done!')
+        end
+        
+        ##
+        # Install common application dependencies like xmllib and imagemagick
+        Spinner.return :message => "Ensuring #{y('common applictation dependencies')} are installed.." do
+          ensure_common_dependencies_are_installed!
+          g('Done!')
+        end
+        
         ##
         # Configures the user
         configure_user!
@@ -123,7 +134,7 @@ module GitPusshuTen
         end
         
         unless e.ssh_key_installed? # prompts root
-          Spinner.return :message => "Installing SSH Key.." do
+          Spinner.return :message => "Installing #{"SSH Key".color(:yellow)}.." do
             e.install_ssh_key!
             g("Done!")
           end
@@ -142,7 +153,7 @@ module GitPusshuTen
         end
         
         unless e.root_ssh_key_installed? # prompts root
-          Spinner.return :message => "Installing SSH Key.." do
+          Spinner.return :message => "Installing #{"SSH Key".color(:yellow)}.." do
             e.install_root_ssh_key!
             g("Done!")
           end
@@ -154,25 +165,7 @@ module GitPusshuTen
       ##
       # Ensures that Git is installed on the remote server
       def ensure_git_installed!
-        if not e.installed?('git') #prompts root
-          warning "It is required that you have #{y('Git')} installed at #{y(c.ip)}."
-          warning "Could not find #{y('Git')}, would you like to install it?"
-          
-          if yes?
-            Spinner.return :message => "Installing #{y('Git')}.." do
-              e.install!('git-core')
-              @git_installed = e.installed?('git')
-              if @git_installed
-                g("Done!")
-              else
-                r("Unable to install Git.")
-              end
-            end
-            exit unless @git_installed
-          else
-            exit
-          end
-        end
+        e.install!('git-core')
       end
 
       ##

data/lib/gitpusshuten/commands/version.rb

@@ -2,7 +2,7 @@
 module GitPusshuTen
   module Commands
     class Version < GitPusshuTen::Commands::Base
-      description "Displays the current version of Git Pusshu Ten (プッシュ点)."
+      description "Displays the current version of Git Pusshu Ten (プッシュ天)."
 
       ##
       # Initializes the Version command
@@ -13,7 +13,7 @@ module GitPusshuTen
       ##
       # Performs the Version command
       def perform!
-        standard "Git Pusshu Ten (プッシュ点) version #{GitPusshuTen::VERSION}"
+        standard "Git Pusshu Ten (プッシュ天) version #{GitPusshuTen::VERSION}"
       end
 
     end

data/lib/gitpusshuten/helpers/environment/user.rb

@@ -15,7 +15,7 @@ module GitPusshuTen
         ##
         # Adds the user to the sudoers file
         def add_user_to_sudoers!
-          execute_as_root("echo '#{c.user} ALL=(ALL) ALL' >> /etc/sudoers")
+          execute_as_root("echo '#{c.user} ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers")
         end
 
         ##
@@ -28,7 +28,7 @@ module GitPusshuTen
         ##
         # Checks to see if the user is already in the sudoers file or not
         def user_in_sudoers?
-          return true if execute_as_root("cat /etc/sudoers").include?("#{c.user} ALL=(ALL) ALL")
+          return true if execute_as_root("cat /etc/sudoers").include?("#{c.user} ALL=(ALL) NOPASSWD: ALL")
           false
         end
 

data/lib/gitpusshuten/version.rb

@@ -1,3 +1,3 @@
 module GitPusshuTen
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gitpusshuten
 version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Michael van Rooijen
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-22 00:00:00 +01:00
+date: 2010-11-23 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,6 +26,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
         - 1
         - 1
@@ -40,6 +42,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 1
         - 6
@@ -55,6 +58,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 2
         - 0
@@ -70,6 +74,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 1
         - 0
@@ -85,6 +90,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 3
         - 0
@@ -100,6 +106,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 1
         - 4
@@ -200,6 +207,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -208,6 +216,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"