keymaker 0.0.6 → 0.0.7

data/Rakefile

@@ -1,5 +1,3 @@
-load 'lib/tasks/neo4j.rake'
-
 #############################################################################
 #
 # Helper functions
@@ -112,7 +110,7 @@ end
 
 desc "Validate #{gemspec_file}"
 task :validate do
-  libfiles = Dir['lib/*'] - ["lib/#{name}.rb", "lib/#{name}", "lib/tasks"]
+  libfiles = Dir['lib/*'] - ["lib/#{name}.rb", "lib/#{name}"]
   unless libfiles.empty?
     puts "Directory `lib` should only contain a `#{name}.rb` file and `#{name}` dir."
     exit!
@@ -122,3 +120,78 @@ task :validate do
     exit!
   end
 end
+
+#############################################################################
+#
+# Neo4j tasks
+#
+#############################################################################
+
+KEYMAKER_ROOT = File.expand_path(File.dirname(__FILE__) + '/../..')
+KEYMAKER_TMP_DIR = File.expand_path(File.join(KEYMAKER_ROOT, "tmp"))
+NEO4J_INSTALL_DIR = ENV['NEO4J_INSTALL_DIR'] || File.expand_path(File.join(KEYMAKER_TMP_DIR, "keymaker_development"))
+NEO4J_PORT = ENV['NEO4J_PORT'] || '7477' # Don't clobber standard neo4j ports 7474 or 7475 for development
+
+namespace :neo4j do
+
+  desc "Install neo4j on localhost:#{NEO4J_PORT}. e.g. rake neo4j:install[community,1.7.M03]"
+  task :install, :edition, :version do |t, args|
+    args.with_defaults(:edition => "community", :version => "1.7")
+
+    source_name = "neo4j-#{args[:edition]}-#{args[:version]}"
+    tarball = "#{source_name}-unix.tar.gz"
+
+    puts "Installing #{source_name} to localhost:#{NEO4J_PORT}..."
+
+    ssl_url_true = "org.neo4j.server.webserver.https.enabled=true"
+    ssl_url_false = ssl_url_true.gsub("true","false")
+
+    %x[mkdir -p #{KEYMAKER_TMP_DIR}; cd #{KEYMAKER_TMP_DIR}]
+    FileUtils.rm_rf(NEO4J_INSTALL_DIR) if Dir.exists?(NEO4J_INSTALL_DIR) && File.owned?(NEO4J_INSTALL_DIR)
+    %x[wget http://dist.neo4j.org/#{tarball}]
+    %x[tar xvzf #{tarball}]
+
+    %x[mv #{source_name} #{NEO4J_INSTALL_DIR}]
+    %x[rm #{tarball}]
+
+    %x[sed -i.bak 's/7474/#{NEO4J_PORT}/g' #{NEO4J_INSTALL_DIR}/conf/neo4j-server.properties]
+    %x[sed -i.bak 's/#{ssl_url_true}/#{ssl_url_false}/g' #{NEO4J_INSTALL_DIR}/conf/neo4j-server.properties]
+
+    puts "#{source_name} Installed into the #{NEO4J_INSTALL_DIR} directory."
+    puts "Run `rake neo4j:start` to start it"
+  end
+
+  desc "Start the neo4j server running on localhost:#{NEO4J_PORT}"
+  task :start do
+    puts "Starting neo4j for keymaker_development..."
+    %x[#{NEO4J_INSTALL_DIR}/bin/neo4j start]
+  end
+
+  desc "Stop the neo4j server running on localhost:#{NEO4J_PORT}"
+  task :stop do
+    puts "Stopping neo4j for keymaker_development..."
+    %x[#{NEO4J_INSTALL_DIR}/bin/neo4j stop]
+  end
+
+  desc "Restart the neo4j server running on localhost:#{NEO4J_PORT}"
+  task :restart do
+    puts "Restarting neo4j for keymaker_development..."
+    %x[#{NEO4J_INSTALL_DIR}/bin/neo4j restart]
+  end
+
+  desc "Wipe out and recreate the neo4j server running on localhost:#{NEO4J_PORT}"
+  task :reset do
+    puts "Resetting neo4j for keymaker_development..."
+    # Stop the server
+    %x[#{NEO4J_INSTALL_DIR}/bin/neo4j stop]
+    # Reset the database
+    FileUtils.rm_rf("#{NEO4J_INSTALL_DIR}/data/graph.db")
+    FileUtils.mkdir("#{NEO4J_INSTALL_DIR}/data/graph.db")
+    # Remove log files
+    FileUtils.rm_rf("#{NEO4J_INSTALL_DIR}/data/log")
+    FileUtils.mkdir("#{NEO4J_INSTALL_DIR}/data/log")
+    # Start the server
+    %x[#{NEO4J_INSTALL_DIR}/bin/neo4j start]
+  end
+
+end

data/keymaker.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'keymaker'
-  s.version           = '0.0.6'
+  s.version           = '0.0.7'
   s.date              = '2012-06-15'
 
   ## Make sure your summary is short. The description may be as long
@@ -76,14 +76,13 @@ Gem::Specification.new do |s|
     lib/keymaker/node.rb
     lib/keymaker/path_traverse_request.rb
     lib/keymaker/rails_tasks.rb
+    lib/keymaker/railtie.rb
     lib/keymaker/remove_node_from_index_request.rb
     lib/keymaker/request.rb
     lib/keymaker/response.rb
     lib/keymaker/serialization.rb
     lib/keymaker/service.rb
     lib/keymaker/update_node_properties_request.rb
-    lib/tasks/keymaker.rake
-    lib/tasks/neo4j.rake
     spec/keymaker/configuration_spec.rb
     spec/keymaker/service_spec.rb
     spec/keymaker_spec.rb

data/lib/keymaker.rb

@@ -22,9 +22,11 @@ require 'keymaker/indexing'
 require 'keymaker/serialization'
 require 'keymaker/node'
 
+require 'keymaker/railtie' if defined? Rails::Railtie
+
 module Keymaker
 
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 
   def self.service
     @service ||= Keymaker::Service.new(Keymaker::Configuration.new)

data/lib/keymaker/rails_tasks.rb

@@ -1,3 +1,4 @@
+# Inspired by the neo4j tasks in maxdemarzi/neography
 NEO4J_INSTALL_DIR = ENV['NEO4J_INSTALL_DIR'] || File.expand_path(File.join(Rails.root, "tmp", "neo_#{Rails.env}"))
 NEO4J_PORT = ENV['NEO4J_PORT'] || Rails.env.test? ? "7475" : "7474"
 

data/lib/keymaker/railtie.rb

@@ -0,0 +1,7 @@
+require 'rails'
+
+class Railtie < Rails::Railtie
+  rake_tasks do
+    load "keymaker/rails_tasks.rb"
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: keymaker
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -152,14 +152,13 @@ files:
 - lib/keymaker/node.rb
 - lib/keymaker/path_traverse_request.rb
 - lib/keymaker/rails_tasks.rb
+- lib/keymaker/railtie.rb
 - lib/keymaker/remove_node_from_index_request.rb
 - lib/keymaker/request.rb
 - lib/keymaker/response.rb
 - lib/keymaker/serialization.rb
 - lib/keymaker/service.rb
 - lib/keymaker/update_node_properties_request.rb
-- lib/tasks/keymaker.rake
-- lib/tasks/neo4j.rake
 - spec/keymaker/configuration_spec.rb
 - spec/keymaker/service_spec.rb
 - spec/keymaker_spec.rb
@@ -179,7 +178,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -792013278918887263
+      hash: 2124841849284898919
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/tasks/keymaker.rake

@@ -1,2 +0,0 @@
-$LOAD_PATH.unshift File.dirname(__FILE__) + '/../../lib'
-load 'keymaker/rails_tasks' if defined?(Rails) && Rails.respond_to?(:env)

data/lib/tasks/neo4j.rake

@@ -1,69 +0,0 @@
-# Inspired by the neo4j tasks in maxdemarzi/neography
-KEYMAKER_ROOT = File.expand_path(File.dirname(__FILE__) + '/../..')
-KEYMAKER_TMP_DIR = File.expand_path(File.join(KEYMAKER_ROOT, "tmp"))
-NEO4J_INSTALL_DIR = ENV['NEO4J_INSTALL_DIR'] || File.expand_path(File.join(KEYMAKER_TMP_DIR, "keymaker_development"))
-NEO4J_PORT = ENV['NEO4J_PORT'] || '7477' # Don't clobber standard neo4j ports 7474 or 7475 for development
-
-namespace :neo4j do
-
-  desc "Install neo4j on localhost:#{NEO4J_PORT}. e.g. rake neo4j:install[community,1.7.M03]"
-  task :install, :edition, :version do |t, args|
-    args.with_defaults(:edition => "community", :version => "1.7")
-
-    source_name = "neo4j-#{args[:edition]}-#{args[:version]}"
-    tarball = "#{source_name}-unix.tar.gz"
-
-    puts "Installing #{source_name} to localhost:#{NEO4J_PORT}..."
-
-    ssl_url_true = "org.neo4j.server.webserver.https.enabled=true"
-    ssl_url_false = ssl_url_true.gsub("true","false")
-
-    %x[mkdir -p #{KEYMAKER_TMP_DIR}; cd #{KEYMAKER_TMP_DIR}]
-    FileUtils.rm_rf(NEO4J_INSTALL_DIR) if Dir.exists?(NEO4J_INSTALL_DIR) && File.owned?(NEO4J_INSTALL_DIR)
-    %x[wget http://dist.neo4j.org/#{tarball}]
-    %x[tar xvzf #{tarball}]
-
-    %x[mv #{source_name} #{NEO4J_INSTALL_DIR}]
-    %x[rm #{tarball}]
-
-    %x[sed -i.bak 's/7474/#{NEO4J_PORT}/g' #{NEO4J_INSTALL_DIR}/conf/neo4j-server.properties]
-    %x[sed -i.bak 's/#{ssl_url_true}/#{ssl_url_false}/g' #{NEO4J_INSTALL_DIR}/conf/neo4j-server.properties]
-
-    puts "#{source_name} Installed into the #{NEO4J_INSTALL_DIR} directory."
-    puts "Run `rake neo4j:start` to start it"
-  end
-
-  desc "Start the neo4j server running on localhost:#{NEO4J_PORT}"
-  task :start do
-    puts "Starting neo4j for keymaker_development..."
-    %x[#{NEO4J_INSTALL_DIR}/bin/neo4j start]
-  end
-
-  desc "Stop the neo4j server running on localhost:#{NEO4J_PORT}"
-  task :stop do
-    puts "Stopping neo4j for keymaker_development..."
-    %x[#{NEO4J_INSTALL_DIR}/bin/neo4j stop]
-  end
-
-  desc "Restart the neo4j server running on localhost:#{NEO4J_PORT}"
-  task :restart do
-    puts "Restarting neo4j for keymaker_development..."
-    %x[#{NEO4J_INSTALL_DIR}/bin/neo4j restart]
-  end
-
-  desc "Wipe out and recreate the neo4j server running on localhost:#{NEO4J_PORT}"
-  task :reset do
-    puts "Resetting neo4j for keymaker_development..."
-    # Stop the server
-    %x[#{NEO4J_INSTALL_DIR}/bin/neo4j stop]
-    # Reset the database
-    FileUtils.rm_rf("#{NEO4J_INSTALL_DIR}/data/graph.db")
-    FileUtils.mkdir("#{NEO4J_INSTALL_DIR}/data/graph.db")
-    # Remove log files
-    FileUtils.rm_rf("#{NEO4J_INSTALL_DIR}/data/log")
-    FileUtils.mkdir("#{NEO4J_INSTALL_DIR}/data/log")
-    # Start the server
-    %x[#{NEO4J_INSTALL_DIR}/bin/neo4j start]
-  end
-
-end