sweatshop_gears 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec1658e35ceb4fdbb0d685556ca88295e9208b80
-  data.tar.gz: 4590751c9868f8f5a07cc2fe5f67bbf774128fa4
+  metadata.gz: c674ba7dbd21928d11433b49f7ba0ff722a5d976
+  data.tar.gz: c3fafd46ef7a1f223fdf58ec6cc40a0e7d681e89
 SHA512:
-  metadata.gz: c173f6f391b05e44e52004def9774b23caf2d839466de65ef8c83bc49bf7c6a86afe75cff8309d92f0b6647265408e4699a53e3042b6ddbf0f58fe84bc806148
-  data.tar.gz: 1ec9db87baf3c994e5109599ecd7d7ff18c9f51b33b7f9198530918d5e6d29ea7932a2eec15fda9e0082b2f17605182e2af6ad50ec7fd7558d813a08d5317462
+  metadata.gz: 8ec3981a117a1229536b823f2f25766a274e21d54f5a3432a87a551bcf646563103d91d12438f4d517de4b28ebef627a8a60c5dc87a50c5c867e43086d319d15
+  data.tar.gz: 21aaf7fcab481a610792499c29bd3799a2a214def189ce688a813389d0bfeb87a5606dce0c08e100cfa6e30bda0dce4514ce6ef6f45fd79e85b280d6c513ccfc

data/.gitignore

@@ -6,4 +6,4 @@ vendor
 coverage
 
 .robot_sweatshop
-.test
+.test_download_path

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sweatshop_gears (1.0.1)
+    sweatshop_gears (1.0.2)
       bundler
       commander
       contracts
@@ -18,7 +18,6 @@ GEM
     celluloid-io (0.15.0)
       celluloid (>= 0.15.0)
       nio4r (>= 0.5.0)
-    colorize (0.7.7)
     commander (4.3.4)
       highline (~> 1.7.2)
     configatron (4.5.0)
@@ -49,7 +48,7 @@ GEM
     moneta (0.8.0)
     nio4r (1.1.0)
     oj (2.12.9)
-    rack (1.6.1)
+    rack (1.6.2)
     rack-protection (1.5.3)
       rack
     rainbow (2.0.0)
@@ -58,9 +57,8 @@ GEM
       moneta (~> 0.8)
     riot (0.12.7)
       rr
-    robot_sweatshop (0.4.3)
+    robot_sweatshop (0.4.7)
       bundler
-      colorize
       commander
       configatron
       contracts
@@ -72,6 +70,7 @@ GEM
       sinatra
       sinatra-cross_origin
       stubborn_queue
+      terminal-announce
     rr (1.1.2)
     sigar (0.7.3)
     simplecov (0.10.0)

data/README.md

@@ -2,10 +2,18 @@
 
 Package management for [Robot Sweatshop](https://github.com/JScott/robot_sweatshop) scripts.
 
-`sweatshop gears <package-name>`
+`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
 
 - Figure out something sane for finding ports for services
-- More metadata (author, description)
 - Source from custom repo
+- More commands:
+    - show <package>
+    - list [--all]
+    - uninstall
+    - update
+- Package versioning
+- Scaffolding scripts?

data/Rakefile

@@ -1,6 +1,7 @@
 require 'rake'
+require 'rake/testtask'
 
-task :test do
+task :bats do
   `sweatshop stop`
   $stdout.sync = true
   puts 'sweatshop-gears'
@@ -11,6 +12,12 @@ task :test do
   end
 end
 
+task :riot do
+  Dir.glob('test/*_test.rb').each do |path|
+    require_relative path
+  end
+end
+
 task :build do
   print 'Building and installing local gem..'
   `gem build sweatshop_gears.gemspec --force`
@@ -20,4 +27,4 @@ task :build do
 end
 
 task default: :test
-task test: :build
+task test: [:build, :riot]

data/bin/sweatshop-gears

@@ -1,10 +1,11 @@
 #!/usr/bin/env ruby
 require 'yaml'
+require 'fileutils'
 require 'commander/import'
 require 'robot_sweatshop/gears'
 
 program :name, 'Sweatshop Gears'
-program :version, '1.0.2'
+program :version, '1.0.3'
 program :description, 'Package management for Robot Sweatshop'
 program :help, 'Author', 'Justin Scott <jvscott@gmail.com>'
 
@@ -12,14 +13,24 @@ default_command :help
 
 command :init do |c|
   c.syntax = 'sweatshop-gears init'
-  c.description = 'Makes the Gears packages available to Robot Sweatshop'
+  c.description = 'Downloads the Sweatshop Gears metadata'
   c.option '--path STRING', String, 'The working path for downloading packages'
   c.action do |_args, options|
-    options.default path: '/opt/gears'
-    Gears.download to_path: options.path
-    Gears.create_runtime_paths
-    Gears::Dependencies.install from_path: options.path
-    Gears::Binaries.expose from_path: options.path
-    Gears::Services.load from_path: options.path
+    options.default path: '/usr/local/gears'
+    FileUtils.mkpath options.path
+    Gears::Metadata.download to_path: options.path
+    Gears::Metadata.create_runtime_paths # TODO: ensure robot_sweatshop ran and the compiled config exists? Only errors in Services
+  end
+end
+
+command :install do |c|
+  c.syntax = 'sweatshop-gears install <package-name>'
+  c.description = 'Makes a Gears package available to Robot Sweatshop'
+  c.option '--path STRING', String, 'The working path for downloading packages'
+  c.action do |args, options|
+    options.default path: '/usr/local/gears'
+    system "sweatshop-gears init --path #{options.path}" unless Dir.exist? options.path
+    fail "#{args.first} already installed" if Dir.exist? "#{options.path}/#{args.first}"
+    Gears::Packages.install args.first, from_path: options.path
   end
 end

data/lib/robot_sweatshop/gears.rb

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

data/lib/robot_sweatshop/gears/binaries.rb

@@ -5,20 +5,9 @@ module Gears
   # Installs binary Gears packages
   module Binaries
     def self.expose(from_path:)
-      Gears.packages(from_path).each do |package|
-        link package if contains_binary? package
-      end
-    end
-
-    def self.contains_binary?(package_path)
-      metadata = Gears.metadata package_path
-      metadata['type'] == 'binary'
-    end
-
-    def self.link(package_path)
-      binary_name = File.basename package_path
-      original_binary = "#{package_path}/#{binary_name}"
-      binary_link = "#{scripts_path}/#{binary_name}"
+      binary_name = File.basename from_path
+      original_binary = File.expand_path "#{from_path}/#{binary_name}"
+      binary_link = File.expand_path "#{scripts_path}/#{binary_name}"
       begin
         FileUtils.symlink original_binary, binary_link
         Announce.success "Symlinked #{binary_name}"
@@ -29,7 +18,7 @@ module Gears
 
     def self.scripts_path
       config = File.expand_path '~/.robot_sweatshop/compiled_config.yaml'
-      Announce.failure 'Please run `sweatshop start` again' unless File.exist? config
+      fail 'Please run `sweatshop start` again' unless File.exist? config
       config = YAML.load File.read(config)
       config[:scripts_path]
     end

data/lib/robot_sweatshop/gears/dependencies.rb

@@ -5,7 +5,7 @@ module Gears
   # Deals with the dependencies from Gears packages
   module Dependencies
     def self.install(from_path:)
-      Gears.packages(from_path).each { |path| install_gems path }
+      install_gems from_path
     end
 
     def self.install_gems(package_path)

data/lib/robot_sweatshop/gears/metadata.rb

@@ -0,0 +1,41 @@
+require 'git'
+require 'yaml'
+require 'terminal-announce'
+require 'fileutils'
+
+# Provides information and downloading of Gears metadata
+module Gears
+  module Metadata
+    def self.clone(path)
+      Git.clone git_repo, File.basename(path), path: File.dirname(path)
+    end
+
+    def self.git_repo
+      'https://github.com/JScott/sweatshop-gears-packages.git'
+    end
+
+    def self.download(to_path:)
+      puts "Downloading metadata from '#{git_repo}'"
+      clone to_path
+      Announce.success 'Metadata downloaded'
+    end
+
+    def self.metadata(package_path)
+      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]
+      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
+    end
+  end
+end

data/lib/robot_sweatshop/gears/packages.rb

@@ -0,0 +1,34 @@
+require 'terminal-announce'
+
+# Provides information and downloading of Gears packages
+module Gears
+  module Packages
+    def self.clone(git_repo, 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 }
+    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)]
+    end
+
+    def self.install(package_name, from_path:)
+      install_path, metadata = data_for package_name, from_path
+      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'
+    rescue
+      Announce.failure 'Error occurred, rolling back installation'
+      FileUtils.rm_rf "#{from_path}/#{package_name}"
+    end
+  end
+end

data/lib/robot_sweatshop/gears/services.rb

@@ -6,29 +6,24 @@ module Gears
   # Installs service Gears packages
   module Services
     def self.load(from_path:)
-      packages = Gears.packages(from_path).select { |package| contains_service? package }
-      services = packages.map { |package| File.basename package }
-      dynamically_load_eye services, from_path
-      services.each { |service| Announce.success "Loaded #{service} into Eye" }
-    end
-
-    def self.contains_service?(package_path)
-      metadata = Gears.metadata package_path
-      metadata['type'] == 'service'
+      service = File.basename from_path
+      dynamically_load_eye service, 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_list, gears_path)
+    def self.dynamically_load_eye(service, gears_path)
       input = File.read "#{__dir__}/sweatshop_gears.eye.eruby"
       eruby = Erubis::Eruby.new input
-      context = { services: service_list, gears_path: File.expand_path(gears_path) }
+      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,12 +15,10 @@ 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 %>/<%= service %>"
+    start_command "<%= gears_path %>/<%= service %>"
     daemonize true
   end
-  <% end %>
 end

data/sweatshop_gears.gemspec

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

data/test/help_test.rb

@@ -0,0 +1,7 @@
+require_relative 'teststrap'
+
+context 'sweatshop-gears help' do
+  teardown { clean_up_paths }
+  setup { `bin/sweatshop-gears help` }
+  denies_topic('the output').empty
+end

data/test/init.bats

@@ -5,31 +5,9 @@
   [ -f .test_download_path/README.md ]
 }
 
-@test "Exposes package binaries" {
+@test "Doesn't download any packages" {
   run sweatshop-gears init --path .test_download_path
-  scripts_path=.robot_sweatshop/scripts
-  [ -f $scripts_path/git-sync ]
-}
-
-@test "Doesn't expose services" {
-  run sweatshop-gears init --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 init --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 init --path .test_download_path
-  [[ $(gem list) =~ "SOME_GEM " ]]
+  [ ! -f .test_download_path/packages/big-green-button/README.md ]
 }
 
 teardown() {

data/test/init_test.rb

@@ -0,0 +1,11 @@
+require_relative 'teststrap'
+require 'fileutils'
+
+
+context 'sweatshop-gears init' do
+  teardown { clean_up_paths }
+  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" }
+end

data/test/install.bats

@@ -0,0 +1,32 @@
+#!/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
+}

data/test/install_test.rb

@@ -0,0 +1,16 @@
+require_relative 'teststrap'
+
+context 'sweatshop-gears install' do
+  setup do
+    clean_up_paths
+    %w(git-sync big-green-button).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" }
+  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('dependencies are installed') { ??? }
+end

data/test/teststrap.rb

@@ -0,0 +1,14 @@
+require 'bundler/setup'
+require 'riot'
+require 'yaml'
+require 'robot_sweatshop/config'
+
+`sweatshop start`
+`sweatshop stop`
+
+PACKAGES_PATH = '.test_download_path'
+SWEATSHOP_SCRIPTS_PATH = '.robot_sweatshop/scripts'
+
+def clean_up_paths
+  FileUtils.rm_rf PACKAGES_PATH
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sweatshop_gears
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Justin Scott
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-15 00:00:00.000000000 Z
+date: 2015-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -166,14 +166,20 @@ files:
 - Rakefile
 - bin/sweatshop-gears
 - lib/robot_sweatshop/gears.rb
-- lib/robot_sweatshop/gears/base.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/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/
 licenses:
 - MIT

data/lib/robot_sweatshop/gears/base.rb

@@ -1,35 +0,0 @@
-require 'git'
-require 'yaml'
-
-# Provides information and downloading of Gears packages
-module Gears
-  def self.clone_packages(path)
-    Git.clone git_repo, File.basename(path), path: File.dirname(path)
-  end
-
-  def self.git_repo
-    'https://github.com/JScott/sweatshop-gears-packages.git'
-  end
-
-  def self.download(to_path:)
-    puts "Downloading packages from '#{git_repo}'"
-    clone_packages to_path
-    Announce.success 'Packages downloaded'
-  end
-
-  def self.packages(gears_path)
-    paths = Dir["#{gears_path}/*"].select { |path| File.directory? path }
-    paths.map { |path| File.expand_path path }
-  end
-
-  def self.metadata(package_path)
-    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]
-    FileUtils.mkpath config[:pidfile_path]
-  end
-end