homesteading 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a82750c6c682b84fb5bfb2166b6a0dbbc01c3da0
-  data.tar.gz: 78a9abdf91ea7819a1ede910f07eda5f4be57811
+  metadata.gz: a268e39a24a8529310b3c12d0ceb99542b803e16
+  data.tar.gz: b6ee7431bc266a2ba5d430b6ba10da1b400f78a7
 SHA512:
-  metadata.gz: cf06b41d47bff573e9ec52f7dee74219ef405fcd4548686e6dc3cc45601932dfad1944c235bb4a609751ff3fe7449251cffe8ee30a18a92d58adc11e3e016294
-  data.tar.gz: 858c29ad2fddeec866a53e17783cd264747b9fc5c8d9b17ab0a42401fd8ca2974d2da1b7cb26bcca158a4be62fe428d36e27df185e4fdbd9171cfc224265a36c
+  metadata.gz: abe953e171117d736bd632250263f8b258101c344aac98a3d967b3ca9b800d95356a64ffb1eb4eb0b91fb4b7991c7bb133a3befcecb62811261e7d8ca69e4616
+  data.tar.gz: 87ff2f5e634d91eee8475cf8991c31cac4ba5bb86577fcebedc30a449c0bc1ee936b8556a02ca04e8ff0b8bc836f2d42f9ae22e1ba48510e9f420e4c3357b75a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    homesteading (0.3.0)
+    homesteading (0.3.1)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -12,7 +12,7 @@ See the [/help](https://github.com/homesteading/homesteading/tree/master/help) d
 
 ## Current Version
 
-0.3.0
+0.3.1
 
 
 ## Code Status
@@ -48,12 +48,13 @@ cd path/to/install/location
 homesteading server
 ```
 
-You can alias `homesteading` to `hs` for shorter commands.
+You can alias `homesteading` to `hs` for shorter commands:
 
 ```bash
 alias hs="homesteading"
 ```
 
+
 ## Tests
 
 Run specs with:
@@ -68,6 +69,7 @@ Or run guard to autorun specs:
 bundle exec guard
 ```
 
+
 ## Authors
 
 * Shane Becker / [@veganstraightedge](https:github.com/veganstraightedge)

data/lib/homesteading/commands/deploy.rb

@@ -14,15 +14,7 @@ module Homesteading
       puts
       options = parse_options
 
-      constellation_path = Dir.pwd
-
-      if options[:app].nil?
-        apps = Dir.glob("#{Dir.pwd}/homesteading-*/")
-      else
-        apps = Dir.glob("#{Dir.pwd}/homesteading-#{options[:app]}/")
-      end
-
-      apps.each do |directory|
+      Dir.glob("#{Dir.pwd}/homesteading-#{options[:app]}*/").each do |directory|
         app           = directory.split("/").last.sub(/homesteading-/, "").downcase
         app_file_path = directory + "app.json"
 
@@ -41,9 +33,15 @@ module Homesteading
             puts "* ...done"
           else
             puts "* Tried deploying #{app}..."
-            puts "*   No git remote named 'heroku'"
-            puts "*   TODO: heroku app create setup"
+            puts "* No git remote named 'heroku'"
+            puts "* Creating heroku app for #{app}..."
+            system "heroku apps:create"
+            puts "* Deploying #{app}..."
+            g.push(g.remote("heroku"))
             puts "* ...done"
+
+            # run initial app remote setup
+            Homesteading::Command.create("init").default(nil, server: :heroku, app: :note)
           end
         end
       end

data/lib/homesteading/commands/init.rb

@@ -4,41 +4,58 @@ module Homesteading
   class Init < Command
     register "init"
 
-    def default(constellation_dir)
-      puts
-      puts "* Setting up all apps"
+    def default(constellation_dir, server: :local, app: nil)
       puts
+      puts "* Running initial setup"
+
+      unless constellation_dir.nil?
+        constellation_dir = "/#{constellation_dir}"
+      end
 
-      Dir.glob("#{Dir.pwd}/#{constellation_dir}/homesteading-*/").each do |app_dir|
+      Dir.glob("#{Dir.pwd}#{constellation_dir}/homesteading-#{app}*/").each do |app_dir|
         app           = app_dir.split("/").last.sub(/homesteading-/, "").downcase
         app_file_path = app_dir + "app.json"
 
         puts "* Setting up: #{app}"
 
         if File.exist?(app_file_path)
-          app_file       = JSON.parse(File.read(app_file_path))
-          app_postdeploy = app_file["scripts"]["postdeploy"]
+          app_postdeploy_script = app_postdeploy(app_file_path)
 
           FileUtils.cd app_dir do
             if File.exist?("#{app_dir}/config/database.example.yml")
-              puts "* Copying database config file"
-              system "rake hs:db:config"
-            end
-
-            unless app_postdeploy.nil? && app_postdeploy.empty?
-              puts "* Running postdeploy command on #{app}:"
+              run_app_postdeploy_script(app, app_postdeploy_script, server)
               puts
-              system app_postdeploy if app_postdeploy
             end
-
-            puts
           end
         end
 
-        puts "* Setup up complete for: #{app}"
-        puts
-        puts
+        puts "* #{server.to_s.capitalize} setup up complete for: #{app}"
+      end
+
+      puts
+    end
+
+    def app_postdeploy(app_file_path)
+      JSON.parse(File.read(app_file_path))["scripts"]["postdeploy"]
+    end
+
+    def run_app_postdeploy_script(app, app_postdeploy_script, server)
+      unless app_postdeploy_script.nil? || app_postdeploy_script.empty?
+        puts "* Running postdeploy script on #{app}:"
+
+        if server ==  :local
+          puts "* Copying database config file"
+          system "bundle exec rake hs:db:config"
+          system app_postdeploy_script
+        else
+          app_postdeploy_script.split("&&").each do |command|
+            remote_command = "#{server.to_s} run #{command}"
+            puts "* Running: #{remote_command}"
+            system remote_command
+          end
+        end
       end
     end
+
   end
 end

data/lib/homesteading/commands/new.rb

@@ -95,7 +95,7 @@ module Homesteading
       end
 
       puts
-      Homesteading::Init.default(constellation_dir)
+      Homesteading::Command.create("init").default(constellation_dir)
 
       unless options[:quiet]
         puts "* Next up, do this:"

data/lib/homesteading/version.rb

@@ -1,4 +1,4 @@
 module Homesteading
-  VERSION  = "0.3.0"
+  VERSION  = "0.3.1"
   CODENAME = "The Rooftop Series"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: homesteading
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Shane Becker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-10 00:00:00.000000000 Z
+date: 2014-12-11 00:00:00.000000000 Z
 dependencies: []
 description: The Homesteading CLI is used to create, update and deploy a constellation
   of homesteading apps that together make up a website powered by Homesteading.