n4j 0.0.1 → 0.0.1.1

data/Rakefile

@@ -9,129 +9,4 @@ Rake::TestTask.new(:test) do |test|
 end
 
 
-namespace :n4j do
-  desc "Create n4j.yml"
-  task :create_n4j_config do
-    require 'psych'
-    conf_file = Psych.dump({'development' => {'port' => 7480, 'secure_port' => 7481},
-                            'test'        => {'port' => 7481, 'secure_port' => 7483}})
-    FileUtils.mkdir_p 'config'
-    File.open('config/n4j.yml', 'w') {|f| f.write(conf_file) }
-  end
-
-  desc "Clear development database."
-  task :clear_development do
-    port = YAML.parse_file('config/n4j.yml').to_ruby['development']['port']
-    result = `curl --request DELETE http://localhost:#{port}/cleandb/all-gone`
-    puts result
-  end
-
-  desc "Status of Neo4j servers"
-  task :status do
-    number_of_neo4j_instances = `ps aux | grep ne[o]4j | wc -l`
-    number_of_neo4j_instances.strip!
-    puts "#{number_of_neo4j_instances} total instances of Neo4j running, system wide."
-    unless number_of_neo4j_instances.to_i < 1
-      YAML.parse_file("config/n4j.yml").to_ruby.each_pair do |environment, conf|
-        pid_filename = "tmp/pids/n4j_#{environment}_pid"
-        if File.exist?(pid_filename)
-          pid = IO.read "tmp/pids/n4j_#{environment}_pid"
-          pid.chomp!
-          result = `ps p#{pid} | grep #{pid} | wc -l`
-          result.strip!
-          puts "#{result} instances running for #{environment} (pid: #{pid})."
-        end
-      end
-    end
-  end
-
-  desc 'Start servers'
-  task :start do  |task_name|
-    require 'erb'
-
-    YAML.parse_file('config/n4j.yml').to_ruby.each_pair do |environment, conf|
-      @environment = environment
-      @port        = conf['port']
-      @secure_port = conf['secure_port']
-      @server_version = 1.6
-
-      neo4j_bin_link = `which neo4j`
-      neo4j_bin_link.chomp!
-      neo4j_bin = Pathname.new(neo4j_bin_link).realpath
-
-      java_command = `which java`
-      java_command.chomp!
-
-      libexec = Pathname.new(neo4j_bin_link).realpath.dirname.dirname
-
-      libdir      = "#{libexec}/lib"
-      syslib      = "#{libexec}/system/lib"
-      plugin_dir  = "#{libexec}/plugins"
-      n4j_plugins = 'neo4j_plugins'
-      neo4j_home  = "tmp/n4j/#{@environment}"
-      pid_file    = "tmp/pids/n4j_#{@environment}_pid"
-
-      FileUtils.mkdir_p neo4j_home
-      FileUtils.mkdir_p "#{neo4j_home}/data/log"
-      FileUtils.mkdir_p 'tmp/pids'
-
-      class_path = [libdir, syslib, plugin_dir, n4j_plugins].collect {|dir| Dir.glob(dir + '/*.jar')}.flatten.join(':')
-      java_opts = "-server -XX:+DisableExplicitGC -Dorg.neo4j.server.properties=conf/neo4j-server.properties -Djava.util.logging.config.file=conf/logging.properties -Xms3m -Xmx64m"
-
-      # system "cp lib/n4j/templates/neo4j.properties tmp/n4j/#{@environment}/"
-      # system "cp lib/n4j/templates/logging.properties tmp/n4j/#{@environment}/"
-      FileUtils.cp 'templates/neo4j.properties', "tmp/n4j/#{@environment}/neo4j.properties"
-      FileUtils.cp 'templates/logging.properties', "tmp/n4j/#{@environment}/logging.properties"
-
-      FileUtils.touch "#{neo4j_home}/data/log/console.log"
-
-      neo4j_server_properties = ERB.new(IO.read("templates/neo4j-server-#{@server_version}.properties")).result
-      neo4j_server_properties_path = "#{neo4j_home}/neo4j-server.properties"
-      File.open(neo4j_server_properties_path, 'w') {|f| f.write(neo4j_server_properties) }
-
-      neo4j_wrapper_conf = ERB.new(IO.read('templates/neo4j-wrapper.conf')).result
-      neo4j_wrapper_conf_path = "#{neo4j_home}/neo4j-wrapper.conf"
-      File.open(neo4j_wrapper_conf_path, 'w') {|f| f.write(neo4j_wrapper_conf) }
-
-      launch_neo4j_command = "#{java_command}
-          -cp #{class_path}
-          -server
-          -XX:+DisableExplicitGC
-          -Dorg.neo4j.server.properties=#{neo4j_server_properties_path}
-          -Djava.util.logging.config.file=#{neo4j_home}/logging.properties
-          -Xms3m
-          -Xmx64m
-          -Dlog4j.configuration=file:#{neo4j_home}/log4j.properties
-          -Dorg.neo4j.server.properties=#{neo4j_server_properties_path}
-          -Djava.util.logging.config.file=#{neo4j_home}/logging.properties
-          -Dneo4j.home=#{neo4j_home}
-          -Dneo4j.instance=#{libexec} org.neo4j.server.Bootstrapper
-          >> #{neo4j_home}/data/log/console.log 2>&1 & echo $! > \"#{pid_file}\"
-          "
-
-      system launch_neo4j_command.gsub(/\n/,' ').gsub(/\s+/, ' ')
-      puts "#{environment.capitalize} Neo4j launched."
-    end
-  end
-
-  desc "Stop server"
-  task :stop do
-    YAML.parse_file('config/n4j.yml').to_ruby.each_pair do |environment, conf|
-      pid_filename = "tmp/pids/n4j_#{environment}_pid"
-      if File.exist?(pid_filename)
-        pid = IO.read pid_filename
-        pid.chomp!
-        result = `ps p#{pid} | grep #{pid} | wc -l`
-        if result.to_i > 0
-          Process.kill("HUP", pid.to_i)
-          puts "Killed #{environment} Neo4j."
-        else
-          puts "#{environment.capitalize} Neo4j wasn't running."
-        end
-      end
-    end
-  end
-
-
-
-end
+load 'lib/tasks/n4j.rake'

data/lib/n4j.rb

@@ -1,6 +1,7 @@
 require "n4j/version"
 require 'active_support/all'
 require 'active_model'
+require 'n4j/railtie' if defined?(Rails)
 
 module N4j
   autoload :Attributes,   'n4j/attributes'

data/lib/n4j/railtie.rb

@@ -0,0 +1,10 @@
+require 'rails'
+module N4j
+  class Railtie < Rails::Railtie
+    railtie_name :n4j
+
+    rake_tasks do
+      Dir[File.join(File.dirname(__FILE__),'../tasks/*.rake')].each { |f| load f }
+    end
+  end
+end

data/lib/n4j/version.rb

@@ -1,3 +1,3 @@
 module N4j
-  VERSION = "0.0.1"
+  VERSION = "0.0.1.1"
 end

data/{tasks → lib/tasks}/n4j.rake

@@ -1,125 +1,126 @@
-require 'erb'
-
 namespace :n4j do
-  
-  desc "Bug du jour"
-  task :bug => :environment do
-    require 'n4j'
-    gn = GenericNode.new({:test => 'foo'})
-    gn.save
-    gn.data = {:test => 'bar'}
-    gn.save
+  desc "Create n4j.yml"
+  task :create_n4j_config do
+    require 'psych'
+    conf_file = Psych.dump({'development' => {'port' => 7480, 'secure_port' => 7481},
+                            'test'        => {'port' => 7481, 'secure_port' => 7483}})
+    FileUtils.mkdir_p 'config'
+    File.open('config/n4j.yml', 'w') {|f| f.write(conf_file) }
   end
-  
+
   desc "Clear development database."
   task :clear_development do
     port = YAML.parse_file('config/n4j.yml').to_ruby['development']['port']
     result = `curl --request DELETE http://localhost:#{port}/cleandb/all-gone`
     puts result
   end
-  
+
   desc "Status of Neo4j servers"
   task :status do
     number_of_neo4j_instances = `ps aux | grep ne[o]4j | wc -l`
     number_of_neo4j_instances.strip!
     puts "#{number_of_neo4j_instances} total instances of Neo4j running, system wide."
     unless number_of_neo4j_instances.to_i < 1
-      YAML.parse_file('config/n4j.yml').to_ruby.each_pair do |environment, conf|
-        pid = IO.read "tmp/pids/n4j_#{environment}_pid"
-        pid.chomp!
-        result = `ps p#{pid} | grep #{pid} | wc -l`
-        result.strip!
-        puts "#{result} instances running for #{environment} (pid: #{pid})."
+      YAML.parse_file("config/n4j.yml").to_ruby.each_pair do |environment, conf|
+        pid_filename = "tmp/pids/n4j_#{environment}_pid"
+        if File.exist?(pid_filename)
+          pid = IO.read "tmp/pids/n4j_#{environment}_pid"
+          pid.chomp!
+          result = `ps p#{pid} | grep #{pid} | wc -l`
+          result.strip!
+          puts "#{result} instances running for #{environment} (pid: #{pid})."
+        end
       end
     end
   end
-  
+
   desc 'Start servers'
   task :start do  |task_name|
+    require 'erb'
+
     YAML.parse_file('config/n4j.yml').to_ruby.each_pair do |environment, conf|
       @environment = environment
       @port        = conf['port']
       @secure_port = conf['secure_port']
       @server_version = 1.6
-      
+
       neo4j_bin_link = `which neo4j`
       neo4j_bin_link.chomp!
       neo4j_bin = Pathname.new(neo4j_bin_link).realpath
 
-      libexec = Pathname.new(neo4j_bin_link).realpath.dirname.dirname
-
-      libdir     = "#{libexec}/lib"
-      syslib     = "#{libexec}/system/lib"
-      plugin_dir = "#{libexec}/plugins"
-      n4j_plugins = 'lib/n4j/neo4j_plugins'
-      # coordinator ???
-
-      class_path = [libdir, syslib, plugin_dir, n4j_plugins].collect {|dir| Dir.glob(dir + '/*.jar')}.flatten.join(':')
-
-      java_opts = "-server -XX:+DisableExplicitGC -Dorg.neo4j.server.properties=conf/neo4j-server.properties -Djava.util.logging.config.file=conf/logging.properties -Xms3m -Xmx64m"
-
+      java_command = `which java`
+      java_command.chomp!
 
+      libexec = Pathname.new(neo4j_bin_link).realpath.dirname.dirname
 
-      neo4j_home     = "tmp/n4j/#{@environment}"
+      libdir      = "#{libexec}/lib"
+      syslib      = "#{libexec}/system/lib"
+      plugin_dir  = "#{libexec}/plugins"
+      n4j_plugins = 'neo4j_plugins'
+      neo4j_home  = "tmp/n4j/#{@environment}"
+      pid_file    = "tmp/pids/n4j_#{@environment}_pid"
 
       FileUtils.mkdir_p neo4j_home
       FileUtils.mkdir_p "#{neo4j_home}/data/log"
-
       FileUtils.mkdir_p 'tmp/pids'
-      pid_file = "tmp/pids/n4j_#{@environment}_pid"
 
-      java_command = `which java`
-      java_command.chomp!
+      class_path = [libdir, syslib, plugin_dir, n4j_plugins].collect {|dir| Dir.glob(dir + '/*.jar')}.flatten.join(':')
+      java_opts = "-server -XX:+DisableExplicitGC -Dorg.neo4j.server.properties=conf/neo4j-server.properties -Djava.util.logging.config.file=conf/logging.properties -Xms3m -Xmx64m"
 
-      system "cp lib/n4j/templates/neo4j.properties tmp/n4j/#{@environment}/"
-      system "cp lib/n4j/templates/logging.properties tmp/n4j/#{@environment}/"
+      # system "cp lib/n4j/templates/neo4j.properties tmp/n4j/#{@environment}/"
+      # system "cp lib/n4j/templates/logging.properties tmp/n4j/#{@environment}/"
+      FileUtils.cp 'templates/neo4j.properties', "tmp/n4j/#{@environment}/neo4j.properties"
+      FileUtils.cp 'templates/logging.properties', "tmp/n4j/#{@environment}/logging.properties"
 
-      system " touch #{neo4j_home}/data/log/console.log"
+      FileUtils.touch "#{neo4j_home}/data/log/console.log"
 
-      neo4j_server_properties = "##### Genereated file! May be overwritten. ##### \n" +
-                                ERB.new(IO.read("lib/n4j/templates/neo4j-server-#{@server_version}.properties")).result
+      neo4j_server_properties = ERB.new(IO.read("templates/neo4j-server-#{@server_version}.properties")).result
       neo4j_server_properties_path = "#{neo4j_home}/neo4j-server.properties"
       File.open(neo4j_server_properties_path, 'w') {|f| f.write(neo4j_server_properties) }
-      
-      neo4j_wrapper_conf = "##### Genereated file! May be overwritten. ##### \n" +
-                           ERB.new(IO.read('lib/n4j/templates/neo4j-wrapper.conf')).result
+
+      neo4j_wrapper_conf = ERB.new(IO.read('templates/neo4j-wrapper.conf')).result
       neo4j_wrapper_conf_path = "#{neo4j_home}/neo4j-wrapper.conf"
       File.open(neo4j_wrapper_conf_path, 'w') {|f| f.write(neo4j_wrapper_conf) }
 
-      launch_neo4j_command = "#{java_command} 
-          -cp #{class_path} 
-          -server 
-          -XX:+DisableExplicitGC 
-          -Dorg.neo4j.server.properties=#{neo4j_server_properties_path} 
-          -Djava.util.logging.config.file=#{neo4j_home}/logging.properties 
-          -Xms3m 
-          -Xmx64m 
-          -Dlog4j.configuration=file:#{neo4j_home}/log4j.properties 
-          -Dorg.neo4j.server.properties=#{neo4j_server_properties_path} 
-          -Djava.util.logging.config.file=#{neo4j_home}/logging.properties 
-          -Dneo4j.home=#{neo4j_home} 
+      launch_neo4j_command = "#{java_command}
+          -cp #{class_path}
+          -server
+          -XX:+DisableExplicitGC
+          -Dorg.neo4j.server.properties=#{neo4j_server_properties_path}
+          -Djava.util.logging.config.file=#{neo4j_home}/logging.properties
+          -Xms3m
+          -Xmx64m
+          -Dlog4j.configuration=file:#{neo4j_home}/log4j.properties
+          -Dorg.neo4j.server.properties=#{neo4j_server_properties_path}
+          -Djava.util.logging.config.file=#{neo4j_home}/logging.properties
+          -Dneo4j.home=#{neo4j_home}
           -Dneo4j.instance=#{libexec} org.neo4j.server.Bootstrapper
-          >> #{neo4j_home}/data/log/console.log 2>&1 & echo $! > \"#{pid_file}\" 
+          >> #{neo4j_home}/data/log/console.log 2>&1 & echo $! > \"#{pid_file}\"
           "
-      # puts launch_neo4j_command
+
       system launch_neo4j_command.gsub(/\n/,' ').gsub(/\s+/, ' ')
       puts "#{environment.capitalize} Neo4j launched."
-      
     end
   end
-  
+
   desc "Stop server"
   task :stop do
     YAML.parse_file('config/n4j.yml').to_ruby.each_pair do |environment, conf|
-      pid = IO.read "tmp/pids/n4j_#{environment}_pid"
-      pid.chomp!
-      result = `ps p#{pid} | grep #{pid} | wc -l`
-      if result.to_i > 0
-        Process.kill("HUP", pid.to_i)
-        puts "Killed #{environment} Neo4j."
-      else
-        puts "#{environment.capitalize} Neo4j wasn't running."
+      pid_filename = "tmp/pids/n4j_#{environment}_pid"
+      if File.exist?(pid_filename)
+        pid = IO.read pid_filename
+        pid.chomp!
+        result = `ps p#{pid} | grep #{pid} | wc -l`
+        if result.to_i > 0
+          Process.kill("HUP", pid.to_i)
+          puts "Killed #{environment} Neo4j."
+        else
+          puts "#{environment.capitalize} Neo4j wasn't running."
+        end
       end
     end
   end
+
+
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: n4j
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70190202311320 !ruby/object:Gem::Requirement
+  requirement: &70264005284380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70190202311320
+  version_requirements: *70264005284380
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70190202310600 !ruby/object:Gem::Requirement
+  requirement: &70264005283880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70190202310600
+  version_requirements: *70264005283880
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70190202310180 !ruby/object:Gem::Requirement
+  requirement: &70264005283460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70190202310180
+  version_requirements: *70264005283460
 description: A little spiked out thing.
 email:
 - samsm@samsm.com
@@ -65,15 +65,16 @@ files:
 - lib/n4j/field.rb
 - lib/n4j/node.rb
 - lib/n4j/populate.rb
+- lib/n4j/railtie.rb
 - lib/n4j/relationship.rb
 - lib/n4j/representation.rb
 - lib/n4j/request.rb
 - lib/n4j/traversal.rb
 - lib/n4j/version.rb
+- lib/tasks/.gitkeep
+- lib/tasks/n4j.rake
 - n4j.gemspec
 - neo4j_plugins/test-delete-db-extension-1.5.jar
-- tasks/.gitkeep
-- tasks/n4j.rake
 - templates/README.txt
 - templates/logging.properties
 - templates/neo4j-server-1.5.properties
@@ -99,7 +100,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -470035939369030678
+      hash: -2011595927392270751
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -108,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -470035939369030678
+      hash: -2011595927392270751
 requirements: []
 rubyforge_project: n4j
 rubygems_version: 1.8.10