homesteading 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80cc70869c0c40d888be826da79f68efb60dcc82
-  data.tar.gz: 7446c3c1e779f5276c52d33931e942bfe9993eae
+  metadata.gz: 5db8d5777b4eb5e818b9ad741685e209816188a4
+  data.tar.gz: 9aa46f5c71d19ee16c7b579f97d24f26acd9e122
 SHA512:
-  metadata.gz: 125f9e637252325d7172ac199a2ac15ccd7524f4484eb357f8978fb6081ee233a1bd4d065e3d6c25e6f7c976abef3560134125aacf7a1fb8654f764d4520501b
-  data.tar.gz: 975451048996a019f038cff05f74593356113902e35fb8eeeef84ed735c6a081a73c80ceccaa8efe29789e54ca61f66706af22c2212416e11d2fc5426501076c
+  metadata.gz: 2c2149e2198269d10702779fbbc6d749e6cb97aa005ee75164fb676d98a3598407d3ef884b4f48eba712bd152bd9564623d1049e08b363ae3810ab83f4e4437c
+  data.tar.gz: 3b444776f3aa5ee0eb4336b22c9bd0a7bfd7fe4f0771e523692afdf230cd92d3c9a7a630c91eac3e5f22585ad8037cb3b2661c445cab7894c4e4d52df92bcd16

data/README.md

@@ -12,7 +12,7 @@ See the [/help](https://github.com/homesteading/homesteading/tree/master/help) d
 
 ## Current Version
 
-0.0.8
+0.0.9
 
 
 ## Requirements

data/help/apps-reroute.md

@@ -1,5 +1,3 @@
-# TODO
-
 Usage: homesteading apps:reroute
 
   change the directory name of a homesteading app
@@ -7,5 +5,6 @@ Usage: homesteading apps:reroute
 Example:
 
     $ apps:reroute statuses --app note
+    
     * Rerouting note to /statuses...
     * ...done

data/help/server-stop.md

@@ -1,4 +1,4 @@
-# TODO
+# TODO:
 
 Usage: homesteading server:stop
 

data/help/server.md

@@ -1,5 +1,3 @@
-# TODO
-
 Usage: homesteading server
 
   start a server for constellation of homesteading apps
@@ -9,19 +7,32 @@ Usage: homesteading server
 Example:
 
     $ homesteading server
-    Homesteading starting...
+    * Homesteading: 0.0.9, codename: Rooftop
+    * Puma:         2.10.2 (ruby 2.1.5-p273), codename: Robots on Comets
+    * Ruby:         2.1.5p273 (2014-11-13 revision 48405) [x86_64-darwin14.0]
+    * Environment:  development
+    * Running on:   http://0.0.0.0:3000
+    
+    * Homesteading servers starting...
     
-    * Homesteading: 1.0.1, codename: Rooftop
-    * Puma: 2.10.2 (ruby 2.1.5-p273), codename: Robots on Comets
-    * Ruby: 2.1.5p273 (2014-11-13 revision 48405) [x86_64-darwin14.0]
-    * Environment: development
-    * Running on: http://0.0.0.0:3000
+    * Starting on port 3002 : article
+    * Starting on port 3003 : bookmark
+    * Starting on port 3004 : event
+    * Starting on port 3005 : feed
+    * Starting on port 3006 : note
+    * Starting on port 3007 : photo
+    * Starting on port 3009 : sound
+    * Starting on port 3010 : video
+    * Starting on port 3011 : walk
+    * Starting on port 3012 : weight
     
-    Use Ctrl-C to stop
+    * To stop Homesteading servers:
+      ctrl-c
+      homesteading server:stop
 
 
 Additional commands, type "homesteading help COMMAND" for more details:
 
 * server:list              #  list the currently running homesteading apps
-* server:stop [--app APP]  #  stop a constellation or a specific app
-* server:urls [--app APP]  #  list the urls of running apps
+* server:stop [--app APP]  #  stop running homesteading apps
+* server:urls [--app APP]  #  list the urls of running homesteading apps

data/lib/homesteading/commands/apps.rb

@@ -244,6 +244,54 @@ class Homesteading
       end
 
       def reroute
+        puts
+        options = parse_options
+
+        if options[:app].nil?
+          puts "* '--app APP' is required for this command"
+          puts
+          exit
+        end
+
+        new_route = ARGV.shift
+        if new_route.nil?
+          puts "* New app route is required for this command"
+          puts "* Example:"
+          puts "  homesteading apps:reroute statuses --app note"
+          puts
+          exit
+        end
+
+        app                = options[:app].downcase
+        constellation_path = Dir.pwd
+        app_dir            = "#{constellation_path}/homesteading-#{app}/"
+        app_file_path      = app_dir + "app.json"
+
+        if File.exist?(app_dir)
+          if File.exist?(app_file_path)
+            app_file      = JSON.parse(File.read(app_file_path))
+            app_file["routes"]["path"] = new_route
+
+            puts "* Rerouting note to /statuses..."
+            new_app_file = JSON.pretty_generate(app_file)
+            File.write(app_file_path, new_app_file)
+            puts "* ...done"
+          else
+            puts "* No app.json found for #{app}"
+            puts
+            exit
+          end
+        else
+          puts "* #{app} does not exist"
+          puts "* Did you mean one of these?"
+          Dir.glob("#{Dir.pwd}/homesteading-*/").each do |ff|
+            puts "  - #{ff.split("/").last.sub(/homesteading-/, "")}"
+          end
+          puts
+          exit
+        end
+
+        puts
       end
 
       private

data/lib/homesteading/commands/server.rb

@@ -3,6 +3,93 @@ class Homesteading
     class << self
 
       def default
+        puts
+        options = parse_options
+
+        router_port = options[:port] || 3000
+
+        # Kill all Homesteading apps when `hs server` is stopped
+        servers = []
+        Signal.trap("INT") do
+          servers.each do |io|
+            puts "Stopping HS:Publisher app at PID: #{io.pid}"
+            Process.kill "SIGINT", io.pid
+          end
+
+          system("homesteading server:stop")
+          exit
+        end
+
+        # TODO
+        homesteading_info = "0.0.9, codename: Rooftop"
+        ruby_info         = RUBY_VERSION
+        puma_info         = "2.10.2 (ruby 2.1.5-p273), codename: Robots on Comets"
+        env_info          = "development"
+
+        puts "* Homesteading: #{homesteading_info}"
+        puts "* Puma:         #{puma_info}"
+        puts "* Ruby:         #{RUBY_VERSION}"
+        puts "* Environment:  #{env_info}"
+        puts "* Running on:   http://0.0.0.0:#{router_port}"
+        puts
+
+        puts "* Homesteading servers starting..."
+        puts
+
+        routes = []
+
+        app_port = 3000
+        Dir.glob("#{Dir.pwd}/homesteading-*/").each_with_index do |directory, index|
+          app_file_path = directory + "app.json"
+
+          if File.exist?(app_file_path)
+            app_file  = JSON.parse(File.read(app_file_path))
+            app_route = app_file["routes"]
+
+            if app_route
+              app_name = directory.split("/").last
+
+              app_path = app_route["path"]
+              if app_name =~ /feed/
+                app_path = "feed"
+              end
+
+              unless app_name == "homesteading-router-rack"
+                app_port += 1
+                routes << "#{app_path}:#{app_port}"
+              end
+
+              if    app_name =~ /homesteading-assets|homesteading-router-rack/
+                # TODO TEMP FIXME serve assets from hub
+                # skipping assets and router
+              elsif app_name == "homesteading-feed"
+                # TODO TEMP FIXME no bin/rails
+                puts "* Starting on port #{app_port} : #{app_name.sub(/homesteading-/, "")}"
+                servers << IO.popen("cd #{directory} && rails server -p #{app_port}", "w")
+              else
+                puts "* Starting on port #{app_port} : #{app_name.sub(/homesteading-/, "")}"
+                servers << IO.popen("cd #{directory} && bin/rails server -d --port #{app_port}", "w")
+              end
+            end
+
+          end
+        end
+
+        # TODO write routes to an env var for hs:router's routes table
+        ENV["HOMESTEADING_ROUTES"] = routes.join(",")
+
+        # start up router after ENV var is set
+        # elsif app_name == "homesteading-router-rack"
+        puts
+        puts "* Starting on port #{router_port} : router"
+        servers << IO.popen("cd #{Dir.pwd}/homesteading-router-rack/ && rackup -p #{router_port}", "w")
+
+
+        puts
+        puts "* To stop Homesteading servers:"
+        puts "  ctrl-c"
+        puts "  homesteading server:stop"
+        puts
       end
 
       def list
@@ -10,13 +97,28 @@ class Homesteading
 
       def stop
         # TEMP HACK TODO FIXME
-        # This is overly aggressive, but the above kill isn't working
+        # This is overly aggressive, but Signal.trap isn't working
         system "killall ruby"
       end
 
       def urls
       end
 
+      private
+      def parse_options
+        # Parse command line options
+        options = {}
+
+        optparse = OptionParser.new do |opts|
+          opts.on("-p", "--port PORT", "Run homesteading site on a specific port (default: 3000)") do |port|
+            options[:port] = port
+          end
+        end
+
+        optparse.parse!
+        options
+      end
+
     end
   end
 end

data/lib/homesteading/commands/version.rb

@@ -5,7 +5,7 @@ class Homesteading
       def default
         # TODO load in *actual* VERSION and CODENAME from homesteading/version
         # puts "Homesteading #{Homesteading::VERSION}, codename: #{Homesteading::CODENAME}"
-        puts "Homesteading 0.0.8, codename: Rooftop"
+        puts "Homesteading 0.0.9, codename: Rooftop"
       end
 
     end

data/lib/homesteading/version.rb

@@ -1,4 +1,4 @@
 module Homesteading
-  VERSION  = "0.0.8"
+  VERSION  = "0.0.9"
   CODENAME = "Rooftop"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: homesteading
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Shane Becker