Merge pull request #12 from ostsjoe/master

hubot --create deprecated
spajus · Apr 18, 2015 · 7b46624 · 7b46624
2 parents 8de5363 + 0f7591b
commit 7b46624
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 1 deletion.
diff --git a/app/controllers/status_controller.rb b/app/controllers/status_controller.rb
@@ -5,6 +5,7 @@ def show
     @npm               = Status.npm
     @coffee            = Status.coffee
     @hubot             = Status.hubot
+    @yo                = Status.yo
     @hubots_dir        = Hubot.base_dir
     @scripts_dir       = Script.base_dir
     @hubots_dir_perms  = Status.hubot_dir_writable?

diff --git a/app/models/hubot.rb b/app/models/hubot.rb
@@ -157,7 +157,8 @@ def cwd
 
     def install
       self.location = File.join(Hubot.base_dir, title.parameterize)
-      log Shell.run("hubot --create #{self.location}")
+      log Shell.run("mkdir #{self.location}")
+      log Shell.run("cd #{self.location} && yo hubot --name='#{name}' --adapter=#{adapter} --defaults")
       log Shell.run("cd #{self.location} && bin/hubot -v")
     end
 

diff --git a/app/models/status.rb b/app/models/status.rb
@@ -18,6 +18,10 @@ def hubot
       @@hubot ||= Shell.run('hubot -v').try(:strip)
     end
 
+    def yo
+      @@yo ||= Shell.run('yo --version').try(:strip)
+    end
+
     def hubot_dir_writable?
       begin
         FileUtils.mkdir_p(Hubot.base_dir)

diff --git a/app/views/status/show.html.erb b/app/views/status/show.html.erb
@@ -25,6 +25,11 @@
     <td><%= @hubot || 'Run <code>npm install -g hubot</code> after Node, NPM and CoffeeScript are installed'.html_safe %></td>
     <td><%= feedback(@hubot, 'Installed', 'Not Installed') %></td>
   </tr>
+  <tr>
+    <td>Yo</td>
+    <td><%= @yo || 'Run <code>npm install -g yo generator-hubot</code> after Hubot, Node, NPM and CoffeeScript are installed'.html_safe %></td>
+    <td><%= feedback(@yo, 'Installed', 'Not Installed') %></td>
+  </tr>
   <tr>
     <td>System user</td>
     <td><%= @sys_user %></td>