fanforce-factory 0.5.2 → 0.6.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjZkZGNhNzQ3NjQyNmJjMmZkYjhmMWQ4MzkxNmEzZWY4ZDgwMzNmOQ==
+    YTBhZjc0ZTU1Mzg1MTBhNzkxNDc1NDBkMjYwZGExZDZkNTkxYjhmMQ==
   data.tar.gz: !binary |-
-    Nzk2NDhjOTc1N2I0YjdhYzQ4ZjY1MmZkNjk1NTNkYThhNDllYjhkZQ==
+    ZmExNTNhNzYyMjM0OTE0NTk1NTk1Y2FmMDFlNGIxNWFhNTVhN2RiMg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NWM0ODI2ZmEzZGQ0NjVmNzBhN2ViNGE5MzY3ZTY0MWM3N2RkNmFmMjhjY2Jl
-    MGM3OWMxZjgyMDQ3OWQ1OGIyMjFhNDMwYTVmNDgwZjA5ZTBmNjY1MDRkNzQw
-    NTYxZGZkMTQzYThmY2NjNTc1N2VhMTY0Mjg4OGJlZDE0MGQ1NDI=
+    N2ZiYzkzYzc0MTJhYzQ4OGVmYTk0OGFjYTk1YzhmYjBmZTRlOTZmZWE4MTdm
+    ZTVjMjNkNDRlN2MzMzY0YTIwYzVhYTZiY2VhNmU3OTRlZmY2YWY0NGI4MWRh
+    NzU1ZWViYTM3MzE3ODg2ZGE0MTJiNTM0NjcyNTA5OWVjZWQ0OGE=
   data.tar.gz: !binary |-
-    ZDRkODQ1YjIzZTU2NTcyZWZkODFlOTU0ZDIxNTUyNTJiZTQ4OTVhY2Q5YzAy
-    ZWQwN2M5NTNiNjBmN2M0NGZiZDhlN2I1YmIyOTBjNzE4NjMyMmE3MGQ1ZmQy
-    MDNmYzUxNWRiYzA5ZWIxMjZiMWZjMGFmZTZkZDhkYTYzMDViMTg=
+    YjdkNTZkM2I4YjZhZmU1YjE4YTRlN2FkYTY5NzQxOTk2MmEzODY1ODE1YTEz
+    MzBjZWM2MDRmNGJjZDFlMDE5NzlhY2YwNmUxNzNhNGIxMDlkZjUyNmUzMDJl
+    MDkwMzlhZGIzNjJhMTdlMzI3ZDI2ZDEzNTkwNDg2MjI1ZDc4Y2Y=

data/bin/factory

@@ -8,11 +8,11 @@ if File.exists?("#{$HomeDir}/config.ru") and File.exists?("#{$HomeDir}/../.facto
   $HomeDir = File.expand_path('..', $HomeDir)
   factory.start(
       :runtype => :single,
-      :allowed => [:setup, :update, :restart, :push, :count, :bundle, :git, :iron, :version, :config],
+      :allowed => [:setup, :update, :restart, :push, :count, :bundle, :git, :iron, :version, :config, :cleanorgs],
   )
 else
   factory.start(
       :runtype => :realtime,
-      :allowed => [:create, :setup, :delete, :update, :restart, :push, :count, :bundle, :git, :iron, :version, :config],
+      :allowed => [:create, :setup, :delete, :update, :restart, :push, :count, :bundle, :git, :iron, :version, :config, :cleanorgs],
   )
 end

data/bin/factory-supercharge

@@ -3,5 +3,5 @@ require 'fanforce/factory'
 
 Fanforce::Factory.new('factory-supercharge').start(
     :runtype => :forked,
-    :allowed => [:update, :restart, :push, :bundle, :git, :iron, :version, :config],
+    :allowed => [:update, :restart, :push, :bundle, :git, :iron, :version, :config, :cleanorgs],
 )

data/fanforce-factory.gemspec

@@ -18,11 +18,13 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ['lib']
 
+  gem.add_dependency 'redis'
   gem.add_dependency 'rest-client'
   gem.add_dependency 'iron_worker_ng'
   gem.add_dependency 'activesupport'
   gem.add_dependency 'heroku-api', '0.3.8'
   gem.add_dependency 'multi_json'
   gem.add_dependency 'bitbucket_rest_api'
+  gem.add_dependency 'fanforce-api'
 
 end

data/lib/fanforce/factory/_base.rb

@@ -188,6 +188,16 @@ class Fanforce::Factory
 
     #################################################################
 
+    elsif ARGV[0] == 'cleanorgs'
+      ARGV[1] =~ /^(development|staging|production)$/ || error('You supplied an invalid cleanorgs command.', :cleanorgs)
+      environment = $1.to_sym
+
+      supercore_api_key = ARGV[2] || error('You supplied an invalid cleanorgs command.', :cleanorgs)
+
+      run(:cleanorgs, environment, supercore_api_key)
+
+     #################################################################
+
     elsif ARGV[0] == 'version'
       puts '---------------------------------------------------------------------------------------------------------------'
       puts "You are using version #{Fanforce::Factory::VERSION} of Fanforce Factory "

data/lib/fanforce/factory/commands.rb

@@ -344,7 +344,7 @@ class Fanforce::Factory
   def restart(addon, environment)
     if environment == :development
       File.mkdir("#{addon.dir}/tmp") if !File.directory?("#{addon.dir}/tmp")
-      FileUtils.touch("#{addon.dir}/tmp/touch.txt")
+      FileUtils.touch("#{addon.dir}/tmp/restart.txt")
     elsif [:production, :staging].include?(environment)
       if $Config[:heroku].blank? or $Config[:heroku][environment].blank?
         puts "#{'OOPS...'.format(:red,:bold)} #{environment} has not been setup on heroku"
@@ -379,6 +379,47 @@ class Fanforce::Factory
 
   ######################################################################################################################
 
+  def run_cleanorgs(addon_dir, processed_count, total_count, environment, supercore_api_key)
+    ENV['RACK_ENV'] = environment.to_s
+    addon = Addon.load(addon_dir)
+    puts "\n---------------------------------------------------------------------------------------------------------------"
+    puts "#{addon.type.to_s.upcase.format(:bold)} - #{addon._id.upcase.gsub('-',' ').format(:bold)} (#{processed_count} of #{total_count})... "
+
+    require 'redis'
+    require 'fanforce/api'
+    ff = Fanforce::API.new(supercore_api_key)
+
+    Dir.chdir(addon_dir) do
+      addon = Addon.load(addon_dir)
+      vars = Env.vars_by_addon(environment)[addon.dir_name] || {}
+      redis = Redis.new(url: vars['REDIS_URL'])
+
+      installs = redis.keys("installed:#{addon.dir_name}:*")
+      organizations = {}
+      redis.multi do
+        organizations = installs.inject({}) do |result, key|
+          next result if key !~ /^(installed:#{addon.dir_name}:(.+))$/
+          result.update $2 => redis.get($1)
+        end
+      end
+      puts "#{organizations.size} installs found..."
+      processed_count = 0
+      organizations.each do |organization_id, api_key|
+        print "- checking organization #{processed_count+=1}... "
+        if ff.get("/organizations/#{organization_id}", fields: '_id')
+          puts 'VALID'
+        else
+          print 'INVALID... '
+          redis.del("installed:#{addon.dir_name}:#{organization_id}")
+          puts 'UNINSTALLED'
+        end
+      end
+
+    end
+  end
+
+  ######################################################################################################################
+
   def preprocess_git_overview
     puts ''
     length = Addons.dir_names.inject(0) {|length, dir_name| dir_name.length > length ? dir_name.length : length }

data/lib/fanforce/factory/help.rb

@@ -89,4 +89,9 @@ config                                              Display your Fanforce Factor
   eos
   end
 
+  def cleanorgs_command; <<-eos
+cleanorgs  environment supercore_api_key            Remove installs that are no longer valid in the db
+  eos
+  end
+
 end

data/lib/fanforce/factory/version.rb

@@ -1,5 +1,5 @@
 class Fanforce
   class Factory
-    VERSION = '0.5.2'
+    VERSION = '0.6.2'
   end
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: fanforce-factory
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.2
 platform: ruby
 authors:
 - Caleb Clark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-11 00:00:00.000000000 Z
+date: 2013-12-04 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: redis
+  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: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +108,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: fanforce-api
+  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'
 description: CLI for managing a folder of Fanforce addons
 email:
 - cclark@mobilizationlabs.com