sweatshop_gears 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c674ba7dbd21928d11433b49f7ba0ff722a5d976
-  data.tar.gz: c3fafd46ef7a1f223fdf58ec6cc40a0e7d681e89
+  metadata.gz: fc3432f3f0c58de91d6369534b3e2c36f21d92c4
+  data.tar.gz: e108f43c71799209c4b1291122b78c38d8f22880
 SHA512:
-  metadata.gz: 8ec3981a117a1229536b823f2f25766a274e21d54f5a3432a87a551bcf646563103d91d12438f4d517de4b28ebef627a8a60c5dc87a50c5c867e43086d319d15
-  data.tar.gz: 21aaf7fcab481a610792499c29bd3799a2a214def189ce688a813389d0bfeb87a5606dce0c08e100cfa6e30bda0dce4514ce6ef6f45fd79e85b280d6c513ccfc
+  metadata.gz: bcc421e65836a289b4535c9c785cc8446cbee10e7fe49954112130225fe511130bf172a17969a187864fa335db23275db7c9dcb54e5104ec34fc15fe6120b755
+  data.tar.gz: b4cc260bc7680a529737ab17e9fa1c884a68273980d2bb05137c8744b960d72eaa2777ccda30ed1c9f966274957354072bb010e4af3f09316b5a0ce5a93dc494

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sweatshop_gears (1.0.2)
+    sweatshop_gears (1.0.4)
       bundler
       commander
       contracts

data/Rakefile

@@ -1,17 +1,7 @@
+require 'terminal-announce'
 require 'rake'
 require 'rake/testtask'
 
-task :bats do
-  `sweatshop stop`
-  $stdout.sync = true
-  puts 'sweatshop-gears'
-  IO.popen "bats #{__dir__}/test --pretty" do |io_stream|
-    while line = io_stream.gets
-      puts line
-    end
-  end
-end
-
 task :riot do
   Dir.glob('test/*_test.rb').each do |path|
     require_relative path
@@ -19,11 +9,10 @@ task :riot do
 end
 
 task :build do
-  print 'Building and installing local gem..'
-  `gem build sweatshop_gears.gemspec --force`
-  print '.'
-  `gem install sweatshop_gears-*.gem`
-  puts 'Done.'
+  Announce.info 'Building and installing local gem...'
+  puts `rm -rf sweatshop_gears-*.gem`
+  puts `gem build sweatshop_gears.gemspec --force`
+  puts `gem install sweatshop_gears-*.gem`
 end
 
 task default: :test

data/bin/sweatshop-gears

@@ -5,7 +5,7 @@ require 'commander/import'
 require 'robot_sweatshop/gears'
 
 program :name, 'Sweatshop Gears'
-program :version, '1.0.3'
+program :version, '1.0.4'
 program :description, 'Package management for Robot Sweatshop'
 program :help, 'Author', 'Justin Scott <jvscott@gmail.com>'
 
@@ -19,6 +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
   end
 end

data/lib/robot_sweatshop/gears/metadata.rb

@@ -27,15 +27,8 @@ module Gears
     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]
-      FileUtils.mkpath config[:pidfile_path]
-    end
-
-    def self.download_and_install(package_name, from_path:)
-      metadata_path = "#{from_path}/#{package_name}.yaml"
-      fail "#{package_name} not found" unless File.exist? metadata_path
-      metadata = YAML.load_file metadata_path
-      Gears::Package.install_from metadata
+      FileUtils.mkpath "#{config[:logfile_path]}/gears"
+      FileUtils.mkpath "#{config[:pidfile_path]}/gears"
     end
   end
 end

data/lib/robot_sweatshop/gears/packages.rb

@@ -4,31 +4,43 @@ require 'terminal-announce'
 module Gears
   module Packages
     def self.clone(git_repo, to_path:)
+      return if Dir.exist? to_path
       Git.clone git_repo, File.basename(to_path), path: File.dirname(to_path)
     end
 
-    def self.packages(gears_path)
-      paths = Dir["#{gears_path}/*"].select { |path| File.directory? path }
-      paths.map { |path| File.expand_path path }
+    def self.metadata_for(package_name, path)
+      metadata_file = "#{path}/#{package_name}.yaml"
+      fail "Metadata for '#{package_name}' not found" unless File.exist? metadata_file
+      YAML.load_file metadata_file
     end
 
-    def self.data_for(package_name, path)
-      install_path = "#{path}/#{package_name}"
-      metadata_path = "#{path}/#{package_name}.yaml"
-      fail "Metadata for '#{package_name}' not found" unless File.exist? metadata_path
-      [install_path, YAML.load_file(metadata_path)]
+    def self.install_to(install_path)
+      case metadata['type']
+      when 'script'
+        Gears::Scripts.expose from_path: install_path
+      when 'service'
+        Gears::Services.load from_path: install_path
+      else
+        fail 'Unknown package type'
+      end
+    end
+
+    def self.expose(plural_type, from_path:)
+      namespace = Gears.const_get plural_type.capitalize.to_sym
+      namespace.send :expose, from_path: from_path
     end
 
     def self.install(package_name, from_path:)
-      install_path, metadata = data_for package_name, from_path
+      metadata = metadata_for package_name, from_path
+      plural_type = "#{metadata['type']}s"
+      install_path = "#{from_path}/#{plural_type}/#{package_name}"
       clone metadata['repo'], to_path: install_path
-      Announce.success "#{package_name} downloaded"
       Gears::Dependencies.install from_path: install_path
-      Gears::Binaries.expose from_path: install_path if metadata['type'] == 'binary'
-      Gears::Services.load from_path: install_path if metadata['type'] == 'service'
+      expose plural_type, from_path: install_path
+      Announce.success "#{package_name} installed"
     rescue
       Announce.failure 'Error occurred, rolling back installation'
-      FileUtils.rm_rf "#{from_path}/#{package_name}"
+      FileUtils.rm_rf install_path
     end
   end
 end

data/lib/robot_sweatshop/gears/{binaries.rb → scripts.rb}

@@ -2,17 +2,17 @@ require 'fileutils'
 require 'terminal-announce'
 
 module Gears
-  # Installs binary Gears packages
-  module Binaries
+  # Installs Gears script packages
+  module Scripts
     def self.expose(from_path:)
-      binary_name = File.basename from_path
-      original_binary = File.expand_path "#{from_path}/#{binary_name}"
-      binary_link = File.expand_path "#{scripts_path}/#{binary_name}"
+      script_name = File.basename from_path
+      original_script = File.expand_path "#{from_path}/#{script_name}"
+      script_link = File.expand_path "#{scripts_path}/#{script_name}"
       begin
-        FileUtils.symlink original_binary, binary_link
-        Announce.success "Symlinked #{binary_name}"
+        FileUtils.symlink original_script, script_link
+        Announce.success "Symlinked #{script_name}"
       rescue
-        Announce.warning "#{binary_name} already exists"
+        Announce.warning "#{script_name} already exists"
       end
     end
 

data/lib/robot_sweatshop/gears/services.rb

@@ -3,27 +3,38 @@ require 'terminal-announce'
 require 'erubis'
 
 module Gears
-  # Installs service Gears packages
+  # Installs Gears service packages
   module Services
-    def self.load(from_path:)
+    def self.expose(from_path:)
       service = File.basename from_path
-      dynamically_load_eye service, 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_config
       puts `eye load #{eye_file}`
       puts `eye stop sweatshop_gears`
       File.delete eye_file
     end
 
-    def self.dynamically_load_eye(service, gears_path)
+    def self.services_installed_to(install_path)
+      paths = Dir["#{install_path}/*"].select { |path| File.directory? path }
+      paths.map { |path| File.basename path }
+    end
+
+    def self.parent_path_of(install_path)
+      File.expand_path "#{install_path}/.."
+    end
+
+    def self.dynamically_load_eye(install_path)
+      context = {
+        services: services_installed_to(parent_path_of(install_path)),
+        install_path: File.expand_path(install_path)
+      }
       input = File.read "#{__dir__}/sweatshop_gears.eye.eruby"
       eruby = Erubis::Eruby.new input
-      context = { service: service, gears_path: File.expand_path(gears_path) }
       write_and_load eruby.result(context)
     end
   end

data/lib/robot_sweatshop/gears/sweatshop_gears.eye.eruby

@@ -15,10 +15,12 @@ Eye.application :sweatshop_gears do
   check :cpu, every: 10.seconds, below: 100, times: 3
   working_dir CONFIG[:working_path]
 
+  <% for service in services %>
   process :'<%= service %>' do
     pid_file "#{PID_PATH}/gears/<%= service %>.pid"
     stdall "#{LOG_PATH}/gears/<%= service %>.log"
-    start_command "<%= gears_path %>/<%= service %>"
+    start_command "<%= install_path %>/<%= service %>"
     daemonize true
   end
+  <% end %>
 end

data/lib/robot_sweatshop/gears.rb

@@ -1,5 +1,5 @@
 require_relative 'gears/metadata'
 require_relative 'gears/packages'
 require_relative 'gears/dependencies'
-require_relative 'gears/binaries'
+require_relative 'gears/scripts'
 require_relative 'gears/services'

data/sweatshop_gears.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name        = 'sweatshop_gears'
-  gem.version     = '1.0.3'
+  gem.version     = '1.0.4'
   gem.licenses    = 'MIT'
   gem.authors     = ['Justin Scott']
   gem.email       = 'jvscott@gmail.com'

data/test/init_test.rb

@@ -7,5 +7,5 @@ context 'sweatshop-gears init' do
   setup { `bin/sweatshop-gears init --path #{PACKAGES_PATH}` }
   denies_topic('the output').empty
   asserts('metadata is downloaded') { File.exist? "#{PACKAGES_PATH}/git-sync.yaml" }
-  denies('packages are downloaded') { File.exist? "#{SWEATSHOP_SCRIPTS_PATH}/git-sync" }
+  denies('packages are downloaded') { File.exist? "#{SWEATSHOP_SCRIPTS_PATH}/scripts/git-sync" }
 end

data/test/install_test.rb

@@ -3,14 +3,14 @@ require_relative 'teststrap'
 context 'sweatshop-gears install' do
   setup do
     clean_up_paths
-    %w(git-sync big-green-button).each do |package|
+    %w(git-sync big-green-button reporter).each do |package|
       `sweatshop-gears install #{package} --path #{PACKAGES_PATH}`
     end
   end
   denies_topic('the output').empty
-  asserts('packages are downloaded') { File.exist? "#{PACKAGES_PATH}/git-sync" }
-  asserts('binaries are symlinked') { File.exist? "#{SWEATSHOP_SCRIPTS_PATH}/git-sync" }
+  asserts('packages are downloaded') { File.exist? "#{PACKAGES_PATH}/scripts/git-sync" }
+  asserts('scripts are symlinked') { File.exist? "#{SWEATSHOP_SCRIPTS_PATH}/git-sync" }
   denies('services are symlinked') { File.exist? "#{SWEATSHOP_SCRIPTS_PATH}/big-green-button" }
-  asserts('services are loaded into Eye') { not `eye info | grep big-green-button`.empty? }
+  asserts('all services are loaded into Eye') { `eye info | grep --extended-regexp 'big-green-button|reporter'`.lines.count == 2 }
   # asserts('dependencies are installed') { ??? }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sweatshop_gears
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Justin Scott
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-17 00:00:00.000000000 Z
+date: 2015-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -166,18 +166,15 @@ files:
 - Rakefile
 - bin/sweatshop-gears
 - lib/robot_sweatshop/gears.rb
-- lib/robot_sweatshop/gears/binaries.rb
 - lib/robot_sweatshop/gears/dependencies.rb
 - lib/robot_sweatshop/gears/metadata.rb
 - 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
 - sweatshop_gears.gemspec
-- test/cli.bats
 - test/help_test.rb
-- test/init.bats
 - test/init_test.rb
-- test/install.bats
 - test/install_test.rb
 - test/teststrap.rb
 homepage: http://www.github.com/jscott/sweatshop-gears-cli/

data/test/cli.bats

@@ -1,9 +0,0 @@
-#!/usr/bin/env bats
-
-# gem build sweatshop-gears.gemspec --quiet
-# gem install robot_sweatshop-gears-*.gem
-
-@test "Runs" {
-  run sweatshop-gears
-  [ $status = 0 ]
-}

data/test/init.bats

@@ -1,15 +0,0 @@
-#!/usr/bin/env bats
-
-@test "Downloads the Gears packages" {
-  run sweatshop-gears init --path .test_download_path
-  [ -f .test_download_path/README.md ]
-}
-
-@test "Doesn't download any packages" {
-  run sweatshop-gears init --path .test_download_path
-  [ ! -f .test_download_path/packages/big-green-button/README.md ]
-}
-
-teardown() {
-  rm -rf .test_download_path
-}

data/test/install.bats

@@ -1,32 +0,0 @@
-#!/usr/bin/env bats
-
-@test "Exposes package binaries" {
-  run sweatshop-gears install git-sync --path .test_download_path
-  scripts_path=.robot_sweatshop/scripts
-  [ -f $scripts_path/git-sync ]
-}
-
-@test "Doesn't expose services" {
-  run sweatshop-gears install big-green-button --path .test_download_path
-  scripts_path=.robot_sweatshop/scripts
-  [ ! -f $scripts_path/big-green-button ]
-}
-
-@test "Loads services into Eye" {
-  eye stop big-green-button
-  run sweatshop-gears install big-green-button --path .test_download_path
-  eye start big-green-button
-  sleep 3
-  [[ $(eye info | grep big-green-button) =~ up ]]
-}
-
-@test "Installs dependencies" {
-  skip "I need a gem to be installed that isn't used by Sweatshop or Gears"
-  yes | gem uninstall SOME_GEM --all
-  sweatshop-gears install git-sync --path .test_download_path
-  [[ $(gem list) =~ "SOME_GEM " ]]
-}
-
-teardown() {
-  rm -rf .test_download_path
-}