cloudblocks 0.0.12g → 0.0.12h

data/bin/cb-agent

@@ -410,7 +410,7 @@ end
 
 # still no api key, we need to get it
 if @api_key.empty?
-	puts 'CloudBlocks Agent One-Time Setup'
+	puts 'CloudBlocks Agent One-Time Setup:'
 	@api_key = ask('Please enter your API key. (you can find it at https://cloudblocks.co/me): ')
 	if @api_key.length != 32
 		puts 'Invalid API key'
@@ -428,13 +428,8 @@ end
 if @agent_id.empty?
 	@quartz = CloudQuartz.new(:api_key => @api_key, :url => @url, :secret_key => @secret_key)
 	register 
-	q = ask("Start the agent as a daemon? ") { |q| q.default = "Y" }
-	if q.chomp.downcase != 'n'
-		@quartz = CloudQuartz.new(:api_key => @api_key, :url => @url, :agent_id => @agent_id, :secret_key => @secret_key)
-		start
-	else
-		exit 0
-	end
+	@quartz = CloudQuartz.new(:api_key => @api_key, :url => @url, :agent_id => @agent_id, :secret_key => @secret_key)
+	start
 end
 
 if command.nil? || command.empty?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudblocks
 version: !ruby/object:Gem::Version
-  version: 0.0.12g
+  version: 0.0.12h
   prerelease: 6
 platform: ruby
 authors:
@@ -142,7 +142,6 @@ dependencies:
 description: See http://cloudblocks.co for more info
 email: hello@thecloudblocks.com
 executables:
-- chief
 - cb-agent
 extensions: []
 extra_rdoc_files: []
@@ -160,7 +159,6 @@ files:
 - lib/plugins/shell.rb
 - lib/plugins/tester.rb
 - lib/plugins/webget.rb
-- bin/chief
 - bin/cb-agent
 homepage: http://cloudblocks.co
 licenses: []

data/bin/chief

@@ -1,143 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'yaml'
-require File.expand_path("../../lib/config-chief", __FILE__)
-require 'optparse'
-begin
-	gem 'eventmachine', '~>1.0.0.beta.4'
-	gem 'faye', '~>0.8.0'
-
-	require 'eventmachine'
-	require 'faye'
-rescue LoadError => exc
-	warn "Cannot find required ruby gems needed to run this agent. Please install cloudblocks gem by running 'gem install cloudblocks'"
-	warn exc
-	exit -1
-end
-
-def stop
-	puts "Stopping"
-	EM.stop
-	exit 0
-end
-
-config_file = 'cloudblocks.yaml'
-config_dir = File.join(Dir.home, '.cloudblocks')
-config_full = File.join(config_dir, config_file)
-
-api_key = ''
-faye_url = 'https://sockets.cloudblocks.co/'
-
-if File.exists?(config_full)	
-	# config file present
-	config = YAML::load(File.open(config_full))
-	api_key = config['api_key']
-else
-	# no config file
-	puts 'CloudBlocks ConfigChief'
-	puts 'Please enter your API key. (you can find it at https://cloudblocks.co/me):'
-	api_key = gets
-	api_key = api_key.chomp
-	if api_key.length != 32
-		puts 'Invalid API key'
-		exit -1
-	else
-		if !FileTest::directory?(config_dir)
-			Dir.mkdir(config_dir)
-		end
-		File.open(config_full, 'w+') { |out| YAML::dump({ 'api_key' => api_key }, out) }
-		puts 'Configuration Saved'
-	end
-end
-
-@version = 1
-str_version = "0.0.#{@version}"
-workspace = nil
-key = nil
-is_test = false
-parameters = {}
-url = nil
-id = nil
-OptionParser.new do |opts|
-	opts.banner = 	<<-EOF
-ConfigChief. v#{str_version} (c) 2012 CloudBlocks
-For more information please visit http://cloudblocks.co
-
-Usage: chief [options]
-
-Options:
-EOF
-
-	opts.on("-w", "--workspace WORKSPACE", "Workspace id") do |v|
-		workspace = v
-	end
-
-	opts.on('-u', '--url URL', 'Server URL') do |v|
-		url = v
-	end
-	url = url || 'https://api.cloudblocks.co'
-
-	opts.on('-k', '--key KEY', 'Config Key') do |v|
-		key = v
-	end
-
-	opts.on('--api-key APIKEY', 'API key') do |v|
-		api_key = v
-	end
-
-	opts.on('-i', '--id ID', 'Config Id') do |v|
-		id = v
-	end
-
-	opts.on('-p', '--parameters P1=V1,P2=V2,...', Array, 'Optional Parameters') do |v|
-		v.each do |p|
-			pv = p.split('=')
-			if pv.count != 2 || pv[0].nil? || pv[1].nil?
-				warn 'Invalid Parameters. Use -h for help'
-				exit -1
-			end
-
-			parameters = parameters.merge({pv[0].to_sym => pv[1]})
-		end
-	end
-
-	opts.on('-t', '--test', 'Test mode. Shows updates received from the server') do |v|
-		is_test = true
-	end
-
-	opts.on_tail("-h", "--help", "Show this message") do
-		puts opts
-		exit 0
-	end
-end.parse!
-
-if workspace.nil?
-	warn 'No workspace specified. Use --help for more info'
-	exit -1 
-end
-
-if key.nil? && id.nil? && !is_test
-	warn 'Either id (-i) or key (-k) have to be present'
-	exit -1
-end
-
-if is_test
-	EM.run {
-	 	Signal.trap('INT') { stop }
-	    Signal.trap('TERM'){ stop }
-
-		puts "Listening for /chief/keys/#{workspace} now on #{faye_url}"
-		client = Faye::Client.new(faye_url)
-		client.subscribe("/chief/keys/#{workspace}") do |message|
-    		puts message.inspect
-		end
-	}
-else
-	chief = ConfigChief.new(:api_key => api_key, :workspace => workspace, :url => url)
-	if (key.nil?)
-		puts chief.get_by_id(id, {}, parameters)
-	else
-		# let's get to bussiness
-		puts chief.get_by_key(key, {}, parameters)
-	end
-end