moodle2cc 0.2.39 → 0.2.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: dc69ac975ad9eb29e995fc53883b09e155470480
-  data.tar.gz: ce7ac78d3aaf59a141a2418729b85345181a5932
+SHA256:
+  metadata.gz: 561c4793b8d845cf9a8228cd849f08b1e7bfd37f407010263c98128049c8eb5e
+  data.tar.gz: 7c7f0e96704d839d02660c7824690021c1426bdb546f9ca6ca8ba82f4d36ba30
 SHA512:
-  metadata.gz: a6c353b0b9a009348557663d87fa30079f0661f6a16eca2a6f5a12de889874962c1b9421f189d2df1b09864e072d1dc046c79b6b7480706601df0cfaca05062a
-  data.tar.gz: 7add535d0d984727131dbb20a9f13065f6a90c80245bf70b2f9c2bef151c5f778ba557f6a5022d7912abafc5f81df4c5824e325c28999cfd1f120be913a91f93
+  metadata.gz: c57cfa1e009d6c07da4fbdc18e2dd323286ea77e2b08cc1ff453e6fae672570795330d6f15284b6b4ac9e837235788eaf19b9b6ab7c992a69ef194b040216e0d
+  data.tar.gz: b363223b4e7f9601084580de445f3bcfac4da1206e616efb0ba07e4eb7cc4d66788162db0f2a8e2670e484e009b7dddec6fb62273b8a24bba47564d35a216618

data/Rakefile

@@ -8,17 +8,15 @@ Rake::TestTask.new do |t|
   t.libs.push "lib"
   t.libs.push "test"
   t.pattern = "test/**/*_test.rb"
-  t.verbose = true
-end
 
-Rake::TestTask.new(:moodle2_test) do |t|
-  t.libs.push "lib"
-  t.libs.push "test"
-  t.pattern = "test/unit/moodle2*/**/*_test.rb"
-  t.verbose = true
+  # setting to true shows ruby interpreter warnings
+  t.warning = false
+  t.verbose = false
 end
 
-RSpec::Core::RakeTask.new(:spec)
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.verbose = false
+end
 
 task :all_tests => [:test, :spec]
 

data/lib/moodle2cc.rb

@@ -13,6 +13,7 @@ require 'securerandom'
 require 'moodle2cc/error'
 require 'moodle2cc/logger'
 require 'moodle2cc/migrator'
+require 'moodle2cc/output_logger'
 
 require 'moodle2cc/moodle2'
 

data/lib/moodle2cc/cc/converter.rb

@@ -95,7 +95,7 @@ module Moodle2CC::CC
               root_item.item(:identifier => create_key(section.id, "section_")) do |item_node|
                 item_node.title "#{course.format} #{section.number}"
                 section.mods.each do |mod|
-                  resource = @resource_factory.get_resource_from_mod(mod.instance)
+                  resource = @resource_factory.get_resource_from_mod(mod.instance) if mod.instance
                   resource.create_organization_item_node(item_node) if resource
                 end
               end

data/lib/moodle2cc/moodle2/parsers/question_category_parser.rb

@@ -39,9 +39,10 @@ module Moodle2CC::Moodle2
       begin
         Parsers::QuestionParsers::QuestionParser.parse(node)
       rescue Exception => e
-        puts e.message
+        Moodle2CC::OutputLogger.logger.info e.message
+        nil
       end
     end
 
   end
-end
+end

data/lib/moodle2cc/moodle2/parsers/question_parsers/question_parser.rb

@@ -44,10 +44,11 @@ module Moodle2CC::Moodle2
 
         question
       rescue Exception => e
-        puts e.message
+        Moodle2CC::OutputLogger.logger.info e.message
+        nil
       end
     end
 
 
   end
-end
+end

data/lib/moodle2cc/moodle2converter/converter_helper.rb

@@ -55,7 +55,7 @@ module Moodle2CC
       # use when we want to retrieve an existing id, not generate a new one
       id = Moodle2Converter::Migrator.activity_id_map[activity.hash]
       unless id
-        puts "could not find matching id for #{activity.inspect}"
+        Moodle2CC::OutputLogger.logger.info "could not find matching id for #{activity.inspect}"
         id = generate_unique_identifier_for_activity(activity)
       end
       id

data/lib/moodle2cc/moodle2converter/html_converter.rb

@@ -60,7 +60,7 @@ module Moodle2CC::Moodle2Converter
         link
       end
     rescue => e
-      puts "invalid url #{link} - #{e.message}"
+      Moodle2CC::OutputLogger.logger.info "invalid url #{link} - #{e.message}"
       link
     end
 
@@ -75,7 +75,8 @@ module Moodle2CC::Moodle2Converter
         "#{WEB_CONTENT_TOKEN}#{cc_file.file_path}"
       end
     rescue => e
-      puts "invalid url #{moodle_path} - #{e.message}"
+      Moodle2CC::OutputLogger.logger.info "invalid url #{moodle_path} - #{e.message}"
+      nil
     end
 
     def lookup_cc_link(activity, id, anchor)
@@ -93,7 +94,10 @@ module Moodle2CC::Moodle2Converter
             "#{OBJECT_TOKEN}/discussion_topics/#{get_unique_identifier_for_activity(forum)}#{anchor}"
           end
         else
-          puts "unknown activity to replace link for. activity:#{activity} id:#{id}"
+          Moodle2CC::OutputLogger.logger.info(
+            "unknown activity to replace link for. activity:#{activity} id:#{id}"
+          )
+          nil
       end
     end
 
@@ -111,4 +115,4 @@ module Moodle2CC::Moodle2Converter
       end
     end
   end
-end
+end

data/lib/moodle2cc/moodle2converter/section_converter.rb

@@ -42,7 +42,8 @@ module Moodle2CC
       begin
         activity_converter_for(moodle_activity).convert_to_module_items(moodle_activity)
       rescue Exception => e
-        puts e.message
+        Moodle2CC::OutputLogger.logger.info e.message
+        nil
       end
     end
 
@@ -92,4 +93,4 @@ module Moodle2CC
     end
 
   end
-end
+end

data/lib/moodle2cc/output_logger.rb

@@ -0,0 +1,18 @@
+module Moodle2CC
+  # Note: the public interface for Moodle2CC::Logger is really #add_warning,
+  # which tries that method on the logger and then falls back to a more
+  # standard #warm method.  But it really doesn't expect the logger to
+  # implement the standard logger interface. Eventually it should probably be
+  # renamed to something else, and this class should be renamed to just Logger
+  # (once usage of the existing logger is moved over).  OR potentially they
+  # could be combined so that "warn" level has special functionality.
+  class OutputLogger
+    def self.logger
+      Thread.current[:__moodle2cc_output_logger__] ||= ::Logger.new(STDOUT)
+    end
+
+    def self.logger=(logger)
+      Thread.current[:__moodle2cc_output_logger__] = logger
+    end
+  end
+end

data/lib/moodle2cc/version.rb

@@ -1,3 +1,3 @@
 module Moodle2CC
-  VERSION = "0.2.39"
+  VERSION = "0.2.40"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moodle2cc
 version: !ruby/object:Gem::Version
-  version: 0.2.39
+  version: 0.2.40
 platform: ruby
 authors:
 - Christopher Durtschi
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-27 00:00:00.000000000 Z
+date: 2018-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -130,14 +130,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
@@ -402,6 +402,7 @@ files:
 - lib/moodle2cc/moodle2converter/questionnaire_converter.rb
 - lib/moodle2cc/moodle2converter/section_converter.rb
 - lib/moodle2cc/moodle2converter/wiki_converter.rb
+- lib/moodle2cc/output_logger.rb
 - lib/moodle2cc/resource_factory.rb
 - lib/moodle2cc/version.rb
 homepage: https://github.com/instructure/moodle2cc
@@ -424,7 +425,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Migrates Moodle backup ZIP to IMS Common Cartridge package