oneis 1.0.0-java → 1.0.1-java

data/lib/check.rb

@@ -29,7 +29,7 @@ module PluginTool
     Dir.glob("#{plugin_dir}/**/*").each do |pathname|
       next unless File.file?(pathname)
       plugin_relative_name = pathname[plugin_dir.length+1, pathname.length]
-      if pathname =~ /\.js\Z/
+      if pathname =~ /\.js\z/
         # Check JavaScript
         report = syntax_check_one_file(plugin, plugin_relative_name)
         if report == nil

data/lib/manifest.rb

@@ -1,6 +1,7 @@
 
 module PluginTool
   
+  # NOTE: Also update packing.rb if this changes
   ALLOWED_PLUGIN_DIRS = ['js', 'static', 'template', 'test', 'data']
   
   def self.generate_manifest(directory)
@@ -10,12 +11,12 @@ module PluginTool
       next unless File.file? pathname
       # Check file
       filename = pathname.slice(directory.length + 1, pathname.length)
-      raise "Bad filename for #{filename}" unless filename =~ /\A([a-zA-Z0-9_\/\-]+\/)?([a-z0-9_-]+\.[a-z0-9]+)\Z/
+      raise "Bad filename for #{filename}" unless filename =~ /\A([a-zA-Z0-9_\/\-]+\/)?([a-z0-9_-]+\.[a-z0-9]+)\z/
       dir = $1
       name = $2
       if dir != nil
-        dir = dir.gsub(/\/\Z/,'')
-        raise "Bad directory #{dir}" unless dir =~ /\A([a-zA-Z0-9_\-]+)[a-zA-Z0-9_\/\-]*\Z/
+        dir = dir.gsub(/\/\z/,'')
+        raise "Bad directory #{dir}" unless dir =~ /\A([a-zA-Z0-9_\-]+)[a-zA-Z0-9_\/\-]*\z/
         raise "Bad root directory #{$1}" unless ALLOWED_PLUGIN_DIRS.include?($1)
       end
       # Get hash of file

data/lib/minimise.rb

@@ -18,11 +18,11 @@ module PluginTool
     end
 
     def process(data, filename)
-      if filename =~ /\.js\Z/
+      if filename =~ /\.js\z/
         # JavaScript - use UglifyJS loaded into the JavaScript interpreter
         @js_min.call(@cx, @javascript_scope, @javascript_scope, [data])
 
-      elsif filename =~ /\.html\Z/
+      elsif filename =~ /\.html\z/
         # Simple processing of HTML
         # Remove HTML comments
         html = data.gsub(/\<\!\-\-.+?\-\-\>/m,'')
@@ -33,7 +33,7 @@ module PluginTool
         html.gsub!(/([\>}])[\r\n]+([\<{])/m,'\1\2')
         html
 
-      elsif filename =~ /\.css\Z/
+      elsif filename =~ /\.css\z/
         # Simple processing of CSS
         css = data.gsub(/(^|\s)\/\*.+?\*\/($|\s)/m,'') # remove C style comments
         out = []

data/lib/new_plugin.rb

@@ -2,7 +2,7 @@
 module PluginTool
 
   def self.make_new_plugin(plugin_name)
-    unless plugin_name =~ /\A[a-z0-9_]+\Z/ && plugin_name.length > 8
+    unless plugin_name =~ /\A[a-z0-9_]+\z/ && plugin_name.length > 8
       end_on_error "Bad plugin name - must use a-z0-9_ only, and more than 8 characters."
     end
     if File.exist?(plugin_name)

data/lib/packing.rb

@@ -1,7 +1,7 @@
 
 module PluginTool
   
-  PACKING_ACCEPTABLE_FILENAME = /\A(plugin\.json|(js|static|template)\/[a-z0-9_-]+\.[a-z0-9]+)\Z/
+  PACKING_ACCEPTABLE_FILENAME = /\A(plugin\.json|(js|static|template|test|data)\/([a-z0-9_-]+\/)*[a-z0-9_-]+\.[a-z0-9]+)\z/
   PACKING_ACCEPTABLE_EXCEPTIONS = ['certificates-temp-http-api.pem']
 
   def self.pack_plugin(plugin_name, output_directory)
@@ -29,9 +29,6 @@ module PluginTool
     end
     # Make file structure
     FileUtils.mkdir(output_plugin_dir)
-    ['js','static','template'].each do |subdir|
-      FileUtils.mkdir("#{output_plugin_dir}/#{subdir}")
-    end
     # Process each file, building a manifest
     puts "Processing files:"
     manifest = ''
@@ -44,7 +41,12 @@ module PluginTool
         data = minimiser.process(data, filename)
       end
       hash = Digest::SHA1.hexdigest(data)
-      File.open("#{output_plugin_dir}/#{filename}", "w") { |f| f.write data }
+      # Make sure output directory exists, write file
+      output_pathname = "#{output_plugin_dir}/#{filename}"
+      output_directory = File.dirname(output_pathname)
+      FileUtils.mkdir_p(output_directory) unless File.directory?(output_directory)
+      File.open(output_pathname, "w") { |f| f.write data }
+      # Filename entry in Manifest
       manifest << "F #{hash} #{filename}\n"
     end
     minimiser.finish

data/lib/plugin.rb

@@ -18,7 +18,7 @@ module PluginTool
       end
       # Setup for using the plugin
       @plugin_dir = @name
-      end_on_error "logic error" unless @plugin_dir =~ /\A[a-zA-Z0-9_-]+\Z/
+      end_on_error "logic error" unless @plugin_dir =~ /\A[a-zA-Z0-9_-]+\z/
       @registration_file = "registration.#{@plugin_dir}.yaml"
       puts "Plugin: #{@plugin_dir}"
     end
@@ -86,7 +86,7 @@ module PluginTool
       case cmd
       when 'license-key'
         application_id = @options.args.first
-        if application_id == nil || application_id !~ /\A\d+\Z/
+        if application_id == nil || application_id !~ /\A\d+\z/
           end_on_error "Numeric application ID must be specified"
         end
         generate_license_key(application_id)
@@ -137,9 +137,9 @@ module PluginTool
       changes = PluginTool.determine_manifest_changes(@current_manifest, next_manifest)
       upload_failed = false
       changes.each do |filename, action|
-        filename =~ /\A(.*?\/)?([^\/]+)\Z/
+        filename =~ /\A(.*?\/)?([^\/]+)\z/
         params = {:filename => $2}
-        params[:directory] = $1.gsub(/\/\Z/,'') if $1
+        params[:directory] = $1.gsub(/\/\z/,'') if $1
         if action == :delete
           puts "  #{@name}: Deleting #{filename}"
           PluginTool.post_yaml("/api/development_plugin_loader/delete_file/#{@loaded_plugin_id}", params)
@@ -163,7 +163,7 @@ module PluginTool
             # Otherwise mark as a failed upload to stop an apply operation which will fail
             upload_failed = true
           end
-          PluginTool.syntax_check(self, filename) if filename =~ /\.js\Z/
+          PluginTool.syntax_check(self, filename) if filename =~ /\.js\z/
         end
       end
       if upload_failed
@@ -189,7 +189,7 @@ module PluginTool
       if info["installSecret"] == nil
         end_on_error "#{@name}: No installSecret specified in plugin.json"
       end
-      license_key = HMAC::SHA1.sign(info["installSecret"], "application:#{ARGV[1]}")
+      license_key = HMAC::SHA1.sign(info["installSecret"], "application:#{application_id}")
       puts <<__E
 
 Plugin:       #{@name}

data/lib/plugin_tool.rb

@@ -32,7 +32,7 @@ opts.each do |opt, argument|
   when '--help'
     show_help = true
   when '--plugin'
-    plugin_names = argument.split(',').map {|n| n.gsub(/[\/\\]+\Z/,'')} # remove trailing dir separators
+    plugin_names = argument.split(',').map {|n| n.gsub(/[\/\\]+\z/,'')} # remove trailing dir separators
   when '--output'
     options.output = argument
   when '--no-console'
@@ -55,7 +55,7 @@ end
 def find_all_plugins()
   all_plugins = []
   Dir.glob("**/plugin.json").each do |p|
-    if p =~ /\A([a-zA-Z0-9_]+)\/plugin\.json\Z/
+    if p =~ /\A([a-zA-Z0-9_]+)\/plugin\.json\z/
       all_plugins << $1
     end
   end

data/lib/version.txt

@@ -1 +1 @@
-6a273e8b32
+71e32da87b

data/oneis.gemspec

@@ -3,15 +3,15 @@ Gem::Specification.new do |s|
   files = Dir.glob("#{root_dir}/**/*.*").map { |x| x[root_dir.length + 1, x.length]}
 
   s.name        = 'oneis'
-  s.version     = '1.0.0'
-  s.date        = '2012-10-24'
+  s.version     = '1.0.1'
+  s.date        = '2013-02-13'
   s.summary     = "ONEIS Tools"
   s.description = "ONEIS Developer Tools"
   s.authors     = ["ONEIS"]
   s.email       = 'client.services@oneis.co.uk'
   s.platform    = "java"
   s.add_dependency('jruby-openssl', '>= 0.7.7')
-  s.add_dependency('json', '>= 1.6.6')
+  s.add_dependency('json', '>= 1.7.7')
   s.files       = files
   s.executables = ['oneis-plugin']
   s.default_executable = 'oneis-plugin'

metadata

@@ -2,7 +2,7 @@
 name: oneis
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.0
+  version: 1.0.1
 platform: java
 authors: 
   - ONEIS
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-24 00:00:00 Z
+date: 2013-02-13 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: jruby-openssl
@@ -31,7 +31,7 @@ dependencies:
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
-            version: 1.6.6
+            version: 1.7.7
     type: :runtime
     version_requirements: *id002
 description: ONEIS Developer Tools