homesteading 0.1.0 → 0.2.0

data/lib/homesteading/commands/init.rb

@@ -1,44 +1,44 @@
-class Homesteading
-  class Init
-    class << self
+require "homesteading/command"
 
-      def default(constellation_dir)
-        puts
-        puts "* Setting up all apps"
-        puts
+module Homesteading
+  class Init < Command
+    register "init"
 
-        Dir.glob("#{Dir.pwd}/#{constellation_dir}/homesteading-*/").each do |app_dir|
-          app           = app_dir.split("/").last.sub(/homesteading-/, "").downcase
-          app_file_path = app_dir + "app.json"
+    def default(constellation_dir)
+      puts
+      puts "* Setting up all apps"
+      puts
 
-          puts "* Setting up: #{app}"
+      Dir.glob("#{Dir.pwd}/#{constellation_dir}/homesteading-*/").each do |app_dir|
+        app           = app_dir.split("/").last.sub(/homesteading-/, "").downcase
+        app_file_path = app_dir + "app.json"
 
-          if File.exist?(app_file_path)
-            app_file       = JSON.parse(File.read(app_file_path))
-            app_postdeploy = app_file["scripts"]["postdeploy"]
+        puts "* Setting up: #{app}"
 
-            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
+        if File.exist?(app_file_path)
+          app_file       = JSON.parse(File.read(app_file_path))
+          app_postdeploy = app_file["scripts"]["postdeploy"]
 
-              unless app_postdeploy.nil? && app_postdeploy.empty?
-                puts "* Running postdeploy command on #{app}:"
-                puts
-                system app_postdeploy if app_postdeploy
-              end
+          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}:"
               puts
+              system app_postdeploy if app_postdeploy
             end
-          end
 
-          puts "* Setup up complete for: #{app}"
-          puts
-          puts
+            puts
+          end
         end
-      end
 
+        puts "* Setup up complete for: #{app}"
+        puts
+        puts
+      end
     end
   end
 end

data/lib/homesteading/commands/new.rb

@@ -1,84 +1,68 @@
+require "homesteading/command"
 require "homesteading/commands/init"
 
-class Homesteading
-  class New
-    class << self
-      PUBLISHER_APPS    = ["article", "bookmark", "event", "note", "photo", "sound", "video", "walk", "weight"]
-      NONPUBLISHER_APPS = ["router-rack"] # TODO "hub", "syndicator"
+module Homesteading
+  class New < Command
+    register "new"
 
-      def default
-        puts
+    PUBLISHER_APPS    = ["article", "bookmark", "event", "note", "photo", "sound", "video", "walk", "weight"]
+    NONPUBLISHER_APPS = ["router-rack"] # TODO "hub", "syndicator"
 
-        options = parse_options
+    def default
+      puts
 
-        # Install location
-        constellation_dir  = ARGV.shift
-        constellation_path = "#{Dir.pwd}/#{constellation_dir}"
+      options = parse_options
 
-        if File.exist?(constellation_path)
-          unless options[:quiet]
-            puts "* #{constellation_path} already exists"
-            puts "* Using #{constellation_path}"
-          end
-        else
-          unless options[:quiet]
-            puts "* Creating homesteading directory: #{constellation_dir}"
-          end
-          unless options[:pretend]
-            FileUtils.mkpath constellation_dir
-          end
-        end
+      # Install location
+      constellation_dir  = ARGV.shift
+      constellation_path = "#{Dir.pwd}/#{constellation_dir}"
 
-        # Apps to install
-        apps = [NONPUBLISHER_APPS, PUBLISHER_APPS].flatten
-        if options[:only]
-          apps = options[:only].split(",").map { |a| a.downcase }
+      if File.exist?(constellation_path)
+        unless options[:quiet]
+          puts "* #{constellation_path} already exists"
+          puts "* Using #{constellation_path}"
         end
-        if options[:except]
-          only_list = options[:except].split(",").map { |a| a.downcase }
-          apps      = apps.delete_if { |a| only_list.include?(a) }
+      else
+        unless options[:quiet]
+          puts "* Creating homesteading directory: #{constellation_dir}"
         end
+        unless options[:pretend]
+          FileUtils.mkpath constellation_dir
+        end
+      end
 
-        apps.each do |app|
-          unless options[:pretend]
-            puts
-          end
-
-          app_dir = "#{constellation_path}/homesteading-#{app}"
-
-          if File.exist?(app_dir)
-            if options[:skip]
-              unless options[:quiet]
-                puts "* #{app_dir} already exists"
-                puts "* Skipping homesteading-#{app}"
-              end
-            elsif options[:force]
-              unless options[:quiet]
-                puts "* #{app_dir} already exists"
-                puts "* Removing homesteading-#{app}"
-              end
+      # Apps to install
+      apps = [NONPUBLISHER_APPS, PUBLISHER_APPS].flatten
+      if options[:only]
+        apps = options[:only].split(",").map { |a| a.downcase }
+      end
+      if options[:except]
+        only_list = options[:except].split(",").map { |a| a.downcase }
+        apps      = apps.delete_if { |a| only_list.include?(a) }
+      end
 
-              unless options[:pretend]
-                FileUtils.rm_rf app_dir
-              end
+      apps.each do |app|
+        unless options[:pretend]
+          puts
+        end
 
-              unless options[:quiet]
-                puts "* Cloning homesteading app from GitHub: #{app}"
-              end
+        app_dir = "#{constellation_path}/homesteading-#{app}"
 
-              unless options[:pretend]
-                FileUtils.cd constellation_dir do
-                  system "git clone git@github.com:homesteading/homesteading-#{app}.git"
-                end
-              end
-            else
-              unless options[:quiet]
-                puts "* #{app_dir} already exists"
-                puts "* TODO gets user input on what to do about the conflict"
-              end
+        if File.exist?(app_dir)
+          if options[:skip]
+            unless options[:quiet]
+              puts "* #{app_dir} already exists"
+              puts "* Skipping homesteading-#{app}"
+            end
+          elsif options[:force]
+            unless options[:quiet]
+              puts "* #{app_dir} already exists"
+              puts "* Removing homesteading-#{app}"
             end
 
-          else
+            unless options[:pretend]
+              FileUtils.rm_rf app_dir
+            end
 
             unless options[:quiet]
               puts "* Cloning homesteading app from GitHub: #{app}"
@@ -89,56 +73,73 @@ class Homesteading
                 system "git clone git@github.com:homesteading/homesteading-#{app}.git"
               end
             end
+          else
+            unless options[:quiet]
+              puts "* #{app_dir} already exists"
+              puts "* TODO gets user input on what to do about the conflict"
+            end
           end
-        end
 
-        puts
-        Homesteading::Init.default(constellation_dir)
+        else
 
-        unless options[:quiet]
-          puts "* Next up, do this:"
-          puts "  cd #{constellation_dir}"
-          puts "  homesteading server"
+          unless options[:quiet]
+            puts "* Cloning homesteading app from GitHub: #{app}"
+          end
+
+          unless options[:pretend]
+            FileUtils.cd constellation_dir do
+              system "git clone git@github.com:homesteading/homesteading-#{app}.git"
+            end
+          end
         end
+      end
 
-        puts
+      puts
+      Homesteading::Init.default(constellation_dir)
+
+      unless options[:quiet]
+        puts "* Next up, do this:"
+        puts "  cd #{constellation_dir}"
+        puts "  homesteading server"
       end
 
-      private
-      def parse_options
-        # Parse command line options
-        options = {}
+      puts
+    end
 
-        optparse = OptionParser.new do |opts|
-          opts.on("-e", "--except EXCEPT", "Comma separated list of apps to not install") do |except|
-            options[:except] = except
-          end
+    private
+    def parse_options
+      # Parse command line options
+      options = {}
 
-          opts.on("-f", "--force", "Overwrite apps that already exist") do |force|
-            options[:force] = force
-          end
+      optparse = OptionParser.new do |opts|
+        opts.on("-e", "--except EXCEPT", "Comma separated list of apps to not install") do |except|
+          options[:except] = except
+        end
 
-          opts.on("-o", "--only ONLY", "Comma separated list of apps to install") do |only|
-            options[:only] = only
-          end
+        opts.on("-f", "--force", "Overwrite apps that already exist") do |force|
+          options[:force] = force
+        end
 
-          opts.on("-p", "--pretend", "Run but do not make any changes") do |pretend|
-            options[:pretend] = pretend
-          end
+        opts.on("-o", "--only ONLY", "Comma separated list of apps to install") do |only|
+          options[:only] = only
+        end
 
-          opts.on("-q", "--quiet", "Suppress status output") do |quiet|
-            options[:quiet] = quiet
-          end
+        opts.on("-p", "--pretend", "Run but do not make any changes") do |pretend|
+          options[:pretend] = pretend
+        end
 
-          opts.on("-s", "--skip", "Skip apps that already exist") do |skip|
-            options[:skip] = skip
-          end
+        opts.on("-q", "--quiet", "Suppress status output") do |quiet|
+          options[:quiet] = quiet
         end
 
-        optparse.parse!
-        options
+        opts.on("-s", "--skip", "Skip apps that already exist") do |skip|
+          options[:skip] = skip
+        end
       end
 
+      optparse.parse!
+      options
     end
+
   end
 end

data/lib/homesteading/commands/run.rb

@@ -1,48 +1,49 @@
-class Homesteading
-  class Run
-    class << self
-
-      def default
-        puts
-        options = parse_options
-        app     = options[:app]
-        command = ARGV.join(" ")
-
-        app_dirs = if app
-          ["#{Dir.pwd}/homesteading-#{app}/"]
-        else
-          Dir.glob("#{Dir.pwd}/homesteading-*/")
-        end
+require "homesteading/command"
+
+module Homesteading
+  class Run < Command
+    register "run"
+
+    def default
+      puts
+      options = parse_options
+      app     = options[:app]
+      command = ARGV.join(" ")
+
+      app_dirs = if app
+        ["#{Dir.pwd}/homesteading-#{app}/"]
+      else
+        Dir.glob("#{Dir.pwd}/homesteading-*/")
+      end
 
-        app_dirs.each do |app_dir|
-          app = app_dir.split("/").last.sub(/homesteading-/, "").downcase
+      app_dirs.each do |app_dir|
+        app = app_dir.split("/").last.sub(/homesteading-/, "").downcase
 
-          puts "* Running command on #{app}:"
-          puts "    #{command}"
-          puts
+        puts "* Running command on #{app}:"
+        puts "    #{command}"
+        puts
 
-          FileUtils.cd app_dir do
-            system command
-          end
-          puts
+        FileUtils.cd app_dir do
+          system command
         end
+        puts
       end
+    end
 
-      private
-      def parse_options
-        # Parse command line options
-        options = {}
+    private
+    def parse_options
+      # Parse command line options
+      options = {}
 
-        optparse = OptionParser.new do |opts|
-          opts.on("-a", "--app APP", "Name of Homesteading app on GitHub") do |app|
-            options[:app] = app
-          end
+      optparse = OptionParser.new do |opts|
+        opts.on("-a", "--app APP", "Name of Homesteading app on GitHub") do |app|
+          options[:app] = app
         end
-
-        optparse.parse!
-        options
       end
 
+      optparse.parse!
+      options
     end
+
   end
 end

data/lib/homesteading/commands/server.rb

@@ -1,117 +1,118 @@
-class Homesteading
-  class Server
-    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
+require "homesteading/command"
+require "puma"
+
+module Homesteading
+  class Server < Command
+    register "server", "s"
+
+    def default
+      puts
+      options = parse_options
+
+      router_port = options[:port] || 3000
 
-          system "homesteading server:stop"
-          exit
+      # 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
 
-        # TODO
-        homesteading_info = "0.1.0, 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
+        system "homesteading server:stop"
+        exit
+      end
+
+      homesteading_info = "#{Homesteading::VERSION}, codename: #{Homesteading::CODENAME}"
+      ruby_info         = RUBY_DESCRIPTION
+      puma_info         = "#{Puma::Const::PUMA_VERSION}, codename: #{Puma::Const::CODE_NAME}"
+      env_info          = "development"
+
+      puts "* Homesteading: #{homesteading_info}"
+      puts "* Puma:         #{puma_info}"
+      puts "* Ruby:         #{ruby_info}"
+      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
 
-        # write routes to an env var for hs:router's routes table
-        ENV["HOMESTEADING_ROUTES"] = routes.join(",")
+      # 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
-        puts
-        puts "* Starting on port #{router_port} : router"
-        servers << IO.popen("cd #{Dir.pwd}/homesteading-router-rack/ && rackup -p #{router_port}", "w")
+      # start up router after ENV var is set
+      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
+      puts
+      puts "* To stop Homesteading servers:"
+      puts "  ctrl-c"
+      puts "  homesteading server:stop"
+      puts
+    end
 
-      def stop
-        # TEMP HACK TODO FIXME
-        # This is overly aggressive, but Signal.trap isn't working
-        system "killall ruby"
-      end
+    def stop
+      # TEMP HACK TODO FIXME
+      # This is overly aggressive, but Signal.trap isn't working
+      system "killall ruby"
+    end
 
-      private
-      def parse_options
-        # Parse command line options
-        options = {}
+    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
+      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
-
-        optparse.parse!
-        options
       end
 
+      optparse.parse!
+      options
     end
+
   end
 end