naf 2.0.0 → 2.0.1

data/README.rdoc

@@ -19,4 +19,5 @@ With a management console, providing:
 
 === Please find up-to-date information on Naf here: {Naf Wiki}[http://www.github.com/fiksu/naf/wiki]
 
-=== Instructions on updgrading Naf to the latest Version: {Instructions}[http://www.github.com/fiksu/naf/wiki/Upgrading]
+=== Instructions on upgrading to Naf v1.1.4: {Instructions}[https://github.com/fiksu/naf/wiki/Upgrading-to-Naf-v1.1.4]
+=== Instructions on upgrading to Naf v2.0.0: {Instructions}[https://github.com/fiksu/naf/wiki/Upgrading-to-Naf-v2.0]

data/RELEASE_NOTES.rdoc

@@ -1,5 +1,14 @@
 = Release Notes
 
+=== Version 2.0.0
+
+Featurs/Changes:
+* New logging system
+* Removed compatibility with Papertrail
+* UI changes
+* Resizable table columns
+* Script handles runner commands
+
 === Version 1.0.0
 
 Features/Changes:

data/app/models/logical/naf/log_parser/runner.rb

@@ -35,7 +35,19 @@ module Logical::Naf
       end
 
       def retrieve_log_files_from_s3
-        s3_log_reader.runner_log_files(record_id)
+        uuids = ::Naf::MachineRunner.
+          joins(:machine_runner_invocations).
+          where("#{Naf.schema_name}.machine_runners.id = ?", record_id).
+          pluck("#{Naf.schema_name}.machine_runner_invocations.uuid")
+
+        files = []
+        s3_log_reader.runner_log_files.each do |file|
+          if uuids.include?(file.scan(UUID_REGEX).first)
+            files << file
+          end
+        end
+
+        files
       end
 
       def get_invocation_id(uuid)
@@ -50,7 +62,7 @@ module Logical::Naf
         if log_type == 'old' && read_from_s3 == 'true'
           get_s3_files do
             @s3_log_reader = ::Logical::Naf::LogReader.new
-            return s3_log_reader.runner_log_files(record_id)
+            return retrieve_log_files_from_s3
           end
         else
           files = Dir["#{::Naf::PREFIX_PATH}/#{::Naf.schema_name}/runners/*/*"]

data/app/models/logical/naf/log_reader.rb

@@ -20,9 +20,8 @@ module Logical
         return sort_files(files)
       end
 
-      def runner_log_files(runner_id)
-        @runner_id = runner_id
-        tree = bucket.objects.with_prefix(prefix).as_tree
+      def runner_log_files
+        tree = bucket.objects.with_prefix(prefix(true)).as_tree
         directories = tree.children.select(&:branch?).collect(&:prefix).uniq
 
         files = []
@@ -58,11 +57,11 @@ module Logical
         @bucket ||= s3.buckets[NAF_BUCKET]
       end
 
-      def prefix
-        if @runner_id.present?
-          "naf/#{project_name}/#{Rails.env}/#{creation_time}/#{::Naf::NAF_DATABASE_HOSTNAME}/#{::Naf::NAF_DATABASE}/#{::Naf.schema_name}/runners/#{@runner_id}/invocations/"
+      def prefix(runner_logs = false)
+        if runner_logs
+          "#{NAF_LOG_PATH}/#{creation_time}/#{::Naf::NAF_DATABASE_HOSTNAME}/#{::Naf::NAF_DATABASE}/#{::Naf.schema_name}/runners/"
         else
-          "naf/#{project_name}/#{Rails.env}/#{creation_time}/#{::Naf::NAF_DATABASE_HOSTNAME}/#{::Naf::NAF_DATABASE}/#{::Naf.schema_name}/jobs/"
+          "#{NAF_LOG_PATH}/#{creation_time}/#{::Naf::NAF_DATABASE_HOSTNAME}/#{::Naf::NAF_DATABASE}/#{::Naf.schema_name}/jobs/"
         end
       end
 

data/app/models/process/naf/log_archiver.rb

@@ -21,7 +21,7 @@ module Process::Naf
       logger.info 'Starting to save files to s3...'
       files.each do |file|
         # Write file if not existent
-        object = bucket.objects["naf/#{project_name}/#{Rails.env}/#{creation_time}" + file[12..-1]]
+        object = bucket.objects["#{NAF_LOG_PATH}/#{creation_time}" + file[12..-1]]
         if !object.exists?
           # Write file to S3
           result = object.write(File.open(file).read)

data/lib/naf/version.rb

@@ -1,3 +1,3 @@
 module Naf
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 end

data/naf.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.name        = "naf"
   s.version     = Naf::VERSION
   s.license     = 'New BSD License'
-  s.date        = '2013-12-19'
+  s.date        = '2014-01-03'
   s.summary     = "Creates infrastructure for a customizable and robust Postgres-backed script scheduling/running"
   s.description = "A cloud based distributed cron, application framework and operations console. Naf works as a distributed script running " +
                   "system that provides scheduling, logging, alarming, machine redundancy, and the ability to set constraint during script execution"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: naf
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-19 00:00:00.000000000 Z
+date: 2014-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails