sweatshop_gears 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc3432f3f0c58de91d6369534b3e2c36f21d92c4
-  data.tar.gz: e108f43c71799209c4b1291122b78c38d8f22880
+  metadata.gz: 99c8425479c3e8e5d9d1e728249d98329e5d8292
+  data.tar.gz: 0f93afe8a5b6152d80a8eb992b4bcd6280ea9d55
 SHA512:
-  metadata.gz: bcc421e65836a289b4535c9c785cc8446cbee10e7fe49954112130225fe511130bf172a17969a187864fa335db23275db7c9dcb54e5104ec34fc15fe6120b755
-  data.tar.gz: b4cc260bc7680a529737ab17e9fa1c884a68273980d2bb05137c8744b960d72eaa2777ccda30ed1c9f966274957354072bb010e4af3f09316b5a0ce5a93dc494
+  metadata.gz: c4c6c5dc3f9d5cc467aa0b56fc7c23d16594a0e7dc1f1c65f310bd520896341c8160a42b12a3ccc1729fe5722b8e5e779ce3bbab77c4b1608d78776c85fe5b78
+  data.tar.gz: 01aacf504642f0631122054ad7d2e48b9c297f0f2d6aa2d2bc7c0d57925d3c0b753aac866dff7c81b383b55b22003bb10dc1ed2fcfcf7838525de3b4656cfa4b

data/FUTURE.md

@@ -0,0 +1,9 @@
+- Figure out something sane for finding ports for services
+- Source from custom repo
+- More commands:
+    - show <package>
+    - list [--all]
+    - uninstall
+    - update
+- Package versioning
+- Scaffolding scripts?

data/Gemfile.lock

@@ -7,12 +7,15 @@ PATH
       contracts
       erubis
       git
+      rack-reverse-proxy
       robot_sweatshop
+      sinatra
       terminal-announce
 
 GEM
   remote: http://rubygems.org/
   specs:
+    addressable (2.3.8)
     celluloid (0.15.2)
       timers (~> 1.1.0)
     celluloid-io (0.15.0)
@@ -24,6 +27,8 @@ GEM
     contracts (0.9)
     daybreak (0.3.0)
     docile (1.1.5)
+    domain_name (0.5.24)
+      unf (>= 0.0.5, < 1.0.0)
     erubis (2.7.0)
     exponential-backoff (0.0.2)
     eye (0.6.4)
@@ -36,21 +41,35 @@ GEM
       ffi-rzmq (~> 2.0)
     faker (1.4.3)
       i18n (~> 0.5)
-    ffi (1.9.8)
+    ffi (1.9.9)
     ffi-rzmq (2.0.4)
       ffi-rzmq-core (>= 1.0.1)
     ffi-rzmq-core (1.0.3)
       ffi (~> 1.9)
     git (1.2.9.1)
     highline (1.7.2)
+    http (0.8.12)
+      addressable (~> 2.3)
+      http-cookie (~> 1.0)
+      http-form_data (~> 1.0.1)
+      http_parser.rb (~> 0.6.0)
+    http-cookie (1.0.2)
+      domain_name (~> 0.5)
+    http-form_data (1.0.1)
+    http_parser.rb (0.6.0)
     i18n (0.7.0)
     json (1.8.3)
     moneta (0.8.0)
     nio4r (1.1.0)
     oj (2.12.9)
-    rack (1.6.2)
+    rack (1.6.4)
     rack-protection (1.5.3)
       rack
+    rack-proxy (0.5.17)
+      rack
+    rack-reverse-proxy (0.8.1)
+      rack (>= 1.0.0)
+      rack-proxy (~> 0.5)
     rainbow (2.0.0)
     rake (10.4.2)
     redislike (0.2.5)
@@ -96,11 +115,15 @@ GEM
     thor (0.19.1)
     tilt (2.0.1)
     timers (1.1.0)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  http
   rake
   riot
   simplecov

data/README.md

@@ -2,18 +2,12 @@
 
 Package management for [Robot Sweatshop](https://github.com/JScott/robot_sweatshop) scripts.
 
+## Usage
+
 `sweatshop gears install <package-name>`
 
 If you can't create `/usr/local/gears`, use the `--path` flag to install everything to somewhere you can.
 
-## Future
+## What packages?
 
-- Figure out something sane for finding ports for services
-- Source from custom repo
-- More commands:
-    - show <package>
-    - list [--all]
-    - uninstall
-    - update
-- Package versioning
-- Scaffolding scripts?
+Right now it only supports pulling from the [official repository](https://github.com/JScott/sweatshop-gears-packages). The plan is to support 3rd party repositories of scripts in the future.

data/bin/sweatshop-gears

@@ -19,8 +19,7 @@ command :init do |c|
     options.default path: '/usr/local/gears'
     FileUtils.mkpath options.path
     Gears::Metadata.download to_path: options.path
-    # TODO: create_runtime_paths not obvious
-    Gears::Metadata.create_runtime_paths # TODO: ensure robot_sweatshop ran and the compiled config exists? Only errors in Services
+    Gears::Services.create_paths
   end
 end
 

data/lib/robot_sweatshop/gears/metadata.rb

@@ -24,11 +24,10 @@ module Gears
       YAML.load File.read("#{package_path}/metadata.yaml")
     end
 
-    def self.create_runtime_paths
-      config_path = File.expand_path '~/.robot_sweatshop/compiled_config.yaml'
-      config = YAML.load_file config_path
-      FileUtils.mkpath "#{config[:logfile_path]}/gears"
-      FileUtils.mkpath "#{config[:pidfile_path]}/gears"
+    def self.sweatshop_config
+      path = File.expand_path '~/.robot_sweatshop/compiled_config.yaml'
+      fail 'Please run `sweatshop start` first' unless File.exist? path
+      YAML.load File.read(path)
     end
   end
 end

data/lib/robot_sweatshop/gears/packages.rb

@@ -38,7 +38,8 @@ module Gears
       Gears::Dependencies.install from_path: install_path
       expose plural_type, from_path: install_path
       Announce.success "#{package_name} installed"
-    rescue
+    rescue => error
+      puts error
       Announce.failure 'Error occurred, rolling back installation'
       FileUtils.rm_rf install_path
     end

data/lib/robot_sweatshop/gears/scripts.rb

@@ -17,10 +17,7 @@ module Gears
     end
 
     def self.scripts_path
-      config = File.expand_path '~/.robot_sweatshop/compiled_config.yaml'
-      fail 'Please run `sweatshop start` again' unless File.exist? config
-      config = YAML.load File.read(config)
-      config[:scripts_path]
+      Gears::Metadata.sweatshop_config[:scripts_path]
     end
   end
 end

data/lib/robot_sweatshop/gears/services.rb

@@ -6,36 +6,47 @@ module Gears
   # Installs Gears service packages
   module Services
     def self.expose(from_path:)
+      services_path = File.expand_path "#{from_path}/.."
+      dynamically_load_eye_from services_path
       service = File.basename from_path
-      dynamically_load_eye from_path
       Announce.success "Loaded #{service} into Eye"
     end
 
     def self.write_and_load(eye_config)
-      eye_file = '/tmp/.sweatshop_gears.eye'
       File.write eye_file, eye_config
       puts `eye load #{eye_file}`
       puts `eye stop sweatshop_gears`
-      File.delete eye_file
     end
 
-    def self.services_installed_to(install_path)
-      paths = Dir["#{install_path}/*"].select { |path| File.directory? path }
-      paths.map { |path| File.basename path }
+    def self.installed_in(path)
+      services = Dir.glob("#{path}/*").select { |path| File.directory? path }
+      services.map { |path| File.basename path }
     end
 
-    def self.parent_path_of(install_path)
-      File.expand_path "#{install_path}/.."
+    def self.eye_file
+      '/tmp/.sweatshop_gears.eye'
     end
 
-    def self.dynamically_load_eye(install_path)
+    def self.first_port
+      34871
+    end
+
+    def self.dynamically_load_eye_from(services_path)
       context = {
-        services: services_installed_to(parent_path_of(install_path)),
-        install_path: File.expand_path(install_path)
+        config: Gears::Metadata.sweatshop_config,
+        services: installed_in(services_path),
+        services_path: services_path,
+        first_port: first_port
       }
-      input = File.read "#{__dir__}/sweatshop_gears.eye.eruby"
+      input = File.read "#{__dir__}/templates/sweatshop_gears.eye.eruby"
       eruby = Erubis::Eruby.new input
       write_and_load eruby.result(context)
     end
+
+    def self.create_paths
+      config = Gears::Metadata.sweatshop_config
+      FileUtils.mkpath "#{config[:logfile_path]}/gears"
+      FileUtils.mkpath "#{config[:pidfile_path]}/gears"
+    end
   end
 end

data/lib/robot_sweatshop/gears/templates/frontpage.html.eruby

@@ -0,0 +1,6 @@
+<h1>Services</h1>
+<ul>
+  <% for service in services %>
+  <li><a href="/<%= service %>"><%= service %></a></li>
+  <% end %>
+</ul>

data/lib/robot_sweatshop/gears/{sweatshop_gears.eye.eruby → templates/sweatshop_gears.eye.eruby}

@@ -1,8 +1,4 @@
-require 'yaml'
-
-# TODO: config not guaranteed to be there. sweatshop has to run first
-CONFIG_PATH = File.expand_path '~/.robot_sweatshop/compiled_config.yaml'
-CONFIG = YAML.load_file CONFIG_PATH
+CONFIG = <%= config %>
 PID_PATH = CONFIG[:pidfile_path]
 LOG_PATH = CONFIG[:logfile_path]
 
@@ -15,11 +11,11 @@ Eye.application :sweatshop_gears do
   check :cpu, every: 10.seconds, below: 100, times: 3
   working_dir CONFIG[:working_path]
 
-  <% for service in services %>
+  <% services.each_with_index do |service, index| %>
   process :'<%= service %>' do
     pid_file "#{PID_PATH}/gears/<%= service %>.pid"
     stdall "#{LOG_PATH}/gears/<%= service %>.log"
-    start_command "<%= install_path %>/<%= service %>"
+    start_command "<%= services_path %>/<%= service %>/<%= service %> <%= first_port+index %>"
     daemonize true
   end
   <% end %>

data/sweatshop_gears.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name        = 'sweatshop_gears'
-  gem.version     = '1.0.4'
+  gem.version     = '1.0.5'
   gem.licenses    = 'MIT'
   gem.authors     = ['Justin Scott']
   gem.email       = 'jvscott@gmail.com'
@@ -17,13 +17,15 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency 'bundler'
   gem.add_runtime_dependency 'commander'
-  gem.add_runtime_dependency 'robot_sweatshop'
   gem.add_runtime_dependency 'contracts'
   gem.add_runtime_dependency 'terminal-announce'
   gem.add_runtime_dependency 'git'
   gem.add_runtime_dependency 'erubis'
+  gem.add_runtime_dependency 'sinatra'
+  gem.add_runtime_dependency 'rack-reverse-proxy'
 
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'riot'
   gem.add_development_dependency 'simplecov'
+  gem.add_development_dependency 'http'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sweatshop_gears
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Justin Scott
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-24 00:00:00.000000000 Z
+date: 2015-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: robot_sweatshop
+  name: contracts
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: contracts
+  name: terminal-announce
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: terminal-announce
+  name: git
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: git
+  name: erubis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +95,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: erubis
+  name: sinatra
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack-reverse-proxy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -150,6 +164,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: http
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Package management for Robot Sweatshop
 email: jvscott@gmail.com
 executables:
@@ -159,6 +187,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rubocop.yml"
+- FUTURE.md
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -171,7 +200,8 @@ files:
 - lib/robot_sweatshop/gears/packages.rb
 - lib/robot_sweatshop/gears/scripts.rb
 - lib/robot_sweatshop/gears/services.rb
-- lib/robot_sweatshop/gears/sweatshop_gears.eye.eruby
+- lib/robot_sweatshop/gears/templates/frontpage.html.eruby
+- lib/robot_sweatshop/gears/templates/sweatshop_gears.eye.eruby
 - sweatshop_gears.gemspec
 - test/help_test.rb
 - test/init_test.rb