gaptool-server 0.6.0 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e207c02d589d8bfb58e728c7b9b62aa529a4dafa
-  data.tar.gz: a260e393c04319f65e9d805c5b2efd67834dc264
+  metadata.gz: 8792919d9131ecb815486fc8d6fdf6c3f1edc7b8
+  data.tar.gz: e049f30e8197148073679ac57ac39b8aae9708dc
 SHA512:
-  metadata.gz: 029ec75667629cab21f13458344987e3c76430e9d7aba798b92d088bccdf0e0b339bb8f374ea1db7db30839b83ec5de7bb4f1621855db260b57f0ac7e0fab924
-  data.tar.gz: e80e3092bfd5d8fa3ae1fe44c09ed21a09a97794c1ee968b8fd395c7304554b8cceea10634abcd904a8375c6511cee49222f50be72e6f4f9dfa171b8580447f1
+  metadata.gz: a24f502022c705b4498c20274493b0149dba3c5ee04dfd9e5dbe1d6c8a6cf0e1f5e759375f9fd04e31bf844e1bfa992f16a7719e531e32926e194d9840a8b2a1
+  data.tar.gz: 7fdfa9f7660507edbede8aafa9b7fd9db2401275e570ea7e72998d1224f4f4e0df2d060240bac4be21a8f014a533871ca20845ef6db53abb2e6829e6eb966a18

data/Rakefile

@@ -30,7 +30,12 @@ unless File.exists?('/.dockerenv')
 
   desc "Start the HTTP server"
   task :server do
-    exec "unicorn #{Shellwords.join(ARGV[1..-1])}"
+    exec "unicorn -p 3000 #{Shellwords.join(ARGV[1..-1])}"
+  end
+
+  desc "Tag git with VERSION"
+  task :tag do
+    exec "git tag v$(cat VERSION)"
   end
 end
 

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.6.3

data/lib/app.rb

@@ -36,9 +36,9 @@ class GaptoolServer < Sinatra::Application
   end
 
   configure do
-    unless ENV['GAPTOOL_AIRBRAKE_KEY'].nil?
+    unless ENV['AIRBRAKE_API_KEY'].nil?
       Airbrake.configure do |cfg|
-        cfg.api_key = ENV['GAPTOOL_AIRBRAKE_KEY']
+        cfg.api_key = ENV['AIRBRAKE_API_KEY']
       end
       use Airbrake::Sinatra
     end

data/lib/helpers/data.rb

@@ -235,7 +235,7 @@ module Gaptool
           $redis.multi do |m|
             m.del(key)
             m.srem("apps", name)
-            m.srem("role:#{role}")
+            m.srem("role:#{role}:apps", name)
           end
         else
           $redis.unwatch
@@ -244,7 +244,8 @@ module Gaptool
     end
 
     def self.get_app_data(app)
-      {"role" => $redis.get("app:#{app}")}
+      role = $redis.get("app:#{app}")
+      return {"role" => role } unless role.nil?
     end
 
     def self.apps

data/tasks/app.rb

@@ -12,9 +12,22 @@ namespace :app do
   end
 
   desc "Remove an application"
-  task :delete, [:app] do |t, args|
-    DH.remove_app(args[:app])
-    puts "Removed app #{args[:app]}"
+  task :del, [:app] do |t, args|
+    unless args[:app].nil? || args[:app].empty?
+      DH.remove_app(args[:app])
+      puts "Removed app #{args[:app]}"
+    end
+  end
+
+  desc "Print app info"
+  task :info, [:app] do |t, args|
+    info = DH.get_app_data(args[:app])
+    if info.nil? || info.empty?
+      puts "No such app #{args[:app]}"
+    else
+      puts " * #{args[:app]} => #{info["role"]}"
+    end
+
   end
 end
 

data/tasks/docker.rb

@@ -10,26 +10,9 @@ unless File.exists?('/.dockerenv')
         printimages
       end
 
-      desc "Build the release image"
-      task :release do
-        sys(%w(./scripts/build_docker_images.sh -t release))
-        printimages
-      end
-
       task :all => [:image]
     end
 
-    namespace :push do
-      task :release do
-        sys(%w(docker push gild/gaptool:release))
-      end
-
-      desc 'Push all tags to the Docker Hub'
-      task :all do
-        sys(%w(docker push gild/gaptool))
-      end
-    end
-
     desc 'Build the docker image'
     task :build => 'build:image'
 
@@ -43,11 +26,6 @@ unless File.exists?('/.dockerenv')
       sys(%w(fig run --rm gaptool rake test))
     end
 
-    desc "Rehash instances"
-    task :rehash => :build do
-      sys(%w(fig run --rm gaptool rake rehash))
-    end
-
     desc "Stop docker containers"
     task :stop do
       sys(%w(fig stop))
@@ -77,11 +55,6 @@ unless File.exists?('/.dockerenv')
     task :run do
       exit sys(%W(fig run --rm gaptool #{ARGV[1..-1].shelljoin}))
     end
-
-    desc "Run a rake task inside the docker container"
-    task :rake do
-      exit sys(%W(fig run --rm gaptool rake #{ARGV[1..-1].shelljoin}))
-    end
   end
 
   desc "Bring up docker containers"

data/tasks/gem.rb

@@ -8,7 +8,10 @@ unless File.exists?('/.dockerenv')
 
     desc "Clean built file"
     task :clean do
-      sys(%w(rm -vf *.gem))
+      Dir.glob("*.gem") do |f|
+        puts " * #{f}"
+        File.unlink(f)
+      end
     end
 
     desc "Bump the version"
@@ -19,6 +22,9 @@ unless File.exists?('/.dockerenv')
       f.write(nver)
       f.close
       puts "Bumped #{version} => #{nver}"
+      exec "git commit -m 'Bump version to v#{nver}' VERSION"
+      Rake::Task["tag"].invoke
+      Rake::Task["gem:build"].invoke
     end
 
     desc "Push"

data/tasks/server.rb

@@ -0,0 +1,11 @@
+namespace :server do
+  desc "Set terminable flag to true/false for the instance :instance"
+  task :set_terminable, [:instance, :value] do |t, args|
+    if args[:instance].nil? || args[:value].nil?
+      puts "You must specify instance and true/false"
+      return
+    end
+    DH.set_server_data_attr args[:instance], 'terminable', (args[:value] == "true" ? "true" : "false")
+    puts DH.get_server_data args[:instance]
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gaptool-server
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.3
 platform: ruby
 authors:
 - Matt Bailey
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-09 00:00:00.000000000 Z
+date: 2014-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -256,6 +256,7 @@ files:
 - tasks/config.rb
 - tasks/docker.rb
 - tasks/gem.rb
+- tasks/server.rb
 - tasks/user.rb
 - test/api_test.rb
 - test/base_test.rb