melissadata 0.1.2 → 0.1.3

data/Gemfile.lock

@@ -1,16 +1,11 @@
 PATH
   remote: .
   specs:
-    melissadata (0.1.1)
+    melissadata (0.1.2)
       activesupport
-      awesome_print
       cloudfiles
-      commander
-      i18n
       msgpack-rpc
-      multi_json
       thor
-      yajl-ruby
 
 GEM
   remote: http://rubygems.org/
@@ -102,12 +97,17 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  awesome_print
+  commander
   growl
   guard-rspec
+  i18n
   melissadata!
+  multi_json
   pry
   rake
   rspec (> 2.4)
   ruby-debug19
   simplecov (>= 0.4.0)
   vagrant
+  yajl-ruby

data/README.md

@@ -21,30 +21,23 @@ Make sure these are all installed on your development machine:
 
 ## Quick Start
 
-Once all the prereqs are installed, this should get you a running
-Vagrant VM:
+Once all the prereqs are installed, run these commands to get your local
+environment setup:
 
     git clone git://github.com/johnnyt/melissadata.git
     cd melissadata
     rake setup
 
-Now make sure you have a MelissaData DVD (or .dmg) mounted (e.g. IPL-DVD-2011-Q1), and run:
+Now make sure you have your MelissaData license string and a MelissaData DVD
+(or .dmg) mounted (e.g. IPL-DVD-2011-Q1), and run:
 
-    rake install_md
+    rake md:install
 
-Then SSH into the Vagrant VM:
+Now you should be able to fire up an IRB session `irb -r melissadata`
+and run:
 
-    bundle exec vagrant ssh
-
-Once logged into the VM - run:
-
-    cd /opt/melissadata/gem
-    irb -r lib/md
-
-Inside the IRB session run:
-
-    irb> ip = MelissaData::NativeObject::IpLocator.new :license => 'YOUR_LICENSE_KEY'
-    irb> ip.process :ip => '74.125.224.81'
+    irb> md = MelissaData.client
+    irb> md.ip '74.125.224.81'
 
 which should return:
 

data/Rakefile

@@ -2,9 +2,11 @@ bundler_installed = !!(%x[gem list] =~ /^bundler/) && File.exists?('Gemfile.lock
 
 desc "Setup the local environment"
 task :setup do
-  sh %Q!gem install bundler --no-ri --no-rdoc! unless bundler_installed
+  sh %Q!gem install bundler --pre --no-ri --no-rdoc! unless bundler_installed
   output = `bundle check 2>&1`
-  unless $?.to_i == 0
+  if $?.to_i == 0
+    puts "Bundler is up to date."
+  else
     sh "bundle install"
   end
 
@@ -12,17 +14,7 @@ task :setup do
     sh "bundle exec vagrant box add lucid64 http://files.vagrantup.com/lucid64.box"
   end
 
-  # sh "bundle exec vagrant up"
-
-  # puts <<-STR
-
-
-  #   Now make sure you have a MelissaData DVD (or .dmg) mounted (e.g. IPL-DVD-2011-Q1),
-  #   then run:
-
-  #     rake md:install
-
-  # STR
+  sh "bundle exec vagrant up"
 end
 
 if bundler_installed

data/chef/cookbooks/melissadata/attributes/default.rb

@@ -2,4 +2,5 @@ default[:melissadata][:paths][:root_dir]        = "/opt/melissadata"
 default[:melissadata][:paths][:config_file]     = "/opt/melissadata/config.yml"
 default[:melissadata][:paths][:license_file]    = "/opt/melissadata/license.txt"
 default[:melissadata][:paths][:log_dir]         = "/var/log/melissadata"
+default[:melissadata][:paths][:bin_dir]         = "/opt/ruby/bin"
 default[:melissadata][:runner_user]             = "vagrant"

data/chef/cookbooks/melissadata/recipes/default.rb

@@ -1,8 +1,9 @@
 include_recipe 'ubuntu'
+include_recipe 'build-essential'
 
 package 'git-core'
 
-%w[ rake bundler i18n thor activesupport multi_json yajl-ruby curl ].each{ |gem| gem_package gem }
+%w[ rake bundler i18n thor cloudfiles activesupport multi_json yajl-ruby curl ].each{ |gem| gem_package gem }
 
 %w[ src lib data ].each do |subdir|
   directory "/opt/melissadata/#{subdir}" do
@@ -32,4 +33,3 @@ end
     action :enable
   end
 end
-

data/chef/cookbooks/melissadata/templates/default/md_tcp_server.init.erb

@@ -12,7 +12,7 @@
 
 NAME=md_tcp_server
 SCRIPTNAME=/etc/init.d/$NAME
-DAEMON=/usr/bin/$NAME
+DAEMON=<%= node[:melissadata][:paths][:bin_dir] %>/$NAME
 PID_FILE=/var/run/$NAME.pid
 RUNASUSER=<%= node[:melissadata][:runner_user] %>
 ARGS=""

data/chef/cookbooks/melissadata/templates/default/md_unix_server.init.erb

@@ -12,7 +12,7 @@
 
 NAME=md_unix_server
 SCRIPTNAME=/etc/init.d/$NAME
-DAEMON=/usr/bin/$NAME
+DAEMON=<%= node[:melissadata][:paths][:bin_dir] %>/$NAME
 PID_FILE=/var/run/$NAME.pid
 RUNASUSER=<%= node[:melissadata][:runner_user] %>
 ARGS=""

data/lib/melissadata/melissadata.rb

@@ -1,11 +1,20 @@
-$LOAD_PATH.unshift File.expand_path('..', File.dirname(__FILE__)) unless $LOAD_PATH.include?(File.expand_path('..', File.dirname(__FILE__)))
+root_path = File.expand_path('..', File.dirname(__FILE__))
+$LOAD_PATH.unshift root_path unless $LOAD_PATH.include?(root_path)
 require 'rubygems'
-require 'pathname'
-require 'i18n'
-require 'thor'
-require 'thor/group'
-require 'thor/actions'
-require 'cloudfiles'
+
+# Development
+begin
+#   require 'bundler'
+#   Bundler.require
+# rescue
+  require 'pathname'
+  require 'i18n'
+  require 'thor'
+  require 'thor/group'
+  require 'thor/actions'
+  require 'cloudfiles'
+# rescue
+end
 
 module MelissaData
   module_function

data/lib/melissadata/vagrant_plugin/actions/install.rb

@@ -45,8 +45,8 @@ module MelissaData::VagrantPlugin::Actions
         end
 
         sudo "chown -R vagrant:vagrant #{target_root}"
-        sudo "/etc/init.d/md_tcp_server start"
-        sudo "/etc/init.d/md_unix_server start"
+        sudo "/etc/init.d/md_tcp_server restart"
+        sudo "/etc/init.d/md_unix_server restart"
       else
         env.ui.error "Vagrant VM is not running", :prefix => false
       end

data/lib/melissadata/version.rb

@@ -1,3 +1,3 @@
 module MelissaData
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

data/melissadata.gemspec

@@ -13,18 +13,18 @@ Gem::Specification.new do |s|
   s.description = s.summary
   s.require_paths = %w[ lib ]
   s.files = Dir["**/*"].map{ |f| f.to_s }
-  s.executables   = Dir['bin/*'].map{ |f| File.basename(f) }
+  s.executables = %w[ md_unix_server md_tcp_server ]
 
-  s.add_dependency 'i18n'
   s.add_dependency 'thor'
   s.add_dependency 'activesupport'
-  s.add_dependency 'multi_json'
   s.add_dependency 'msgpack-rpc'
-  s.add_dependency 'awesome_print'
-  s.add_dependency 'yajl-ruby'
   s.add_dependency 'cloudfiles'
-  s.add_dependency 'commander'
 
+  s.add_development_dependency 'i18n'
+  s.add_development_dependency 'multi_json'
+  s.add_development_dependency 'awesome_print'
+  s.add_development_dependency 'yajl-ruby'
+  s.add_development_dependency 'commander'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'vagrant'
   s.add_development_dependency 'rspec', '>2.4'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: melissadata
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,8 +13,8 @@ cert_chain: []
 date: 2011-11-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: i18n
-  requirement: &70143628410800 !ruby/object:Gem::Requirement
+  name: thor
+  requirement: &70131120435220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70143628410800
+  version_requirements: *70131120435220
 - !ruby/object:Gem::Dependency
-  name: thor
-  requirement: &70143628408820 !ruby/object:Gem::Requirement
+  name: activesupport
+  requirement: &70131120434380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70143628408820
+  version_requirements: *70131120434380
 - !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: &70143628406720 !ruby/object:Gem::Requirement
+  name: msgpack-rpc
+  requirement: &70131120433460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70143628406720
+  version_requirements: *70131120433460
 - !ruby/object:Gem::Dependency
-  name: multi_json
-  requirement: &70143628405080 !ruby/object:Gem::Requirement
+  name: cloudfiles
+  requirement: &70131120432140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,65 +55,65 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70143628405080
+  version_requirements: *70131120432140
 - !ruby/object:Gem::Dependency
-  name: msgpack-rpc
-  requirement: &70143628403480 !ruby/object:Gem::Requirement
+  name: i18n
+  requirement: &70131120431100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
-  version_requirements: *70143628403480
+  version_requirements: *70131120431100
 - !ruby/object:Gem::Dependency
-  name: awesome_print
-  requirement: &70143628401440 !ruby/object:Gem::Requirement
+  name: multi_json
+  requirement: &70131120430380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
-  version_requirements: *70143628401440
+  version_requirements: *70131120430380
 - !ruby/object:Gem::Dependency
-  name: yajl-ruby
-  requirement: &70143628399560 !ruby/object:Gem::Requirement
+  name: awesome_print
+  requirement: &70131120429500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
-  version_requirements: *70143628399560
+  version_requirements: *70131120429500
 - !ruby/object:Gem::Dependency
-  name: cloudfiles
-  requirement: &70143628398580 !ruby/object:Gem::Requirement
+  name: yajl-ruby
+  requirement: &70131120426260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
-  version_requirements: *70143628398580
+  version_requirements: *70131120426260
 - !ruby/object:Gem::Dependency
   name: commander
-  requirement: &70143628397480 !ruby/object:Gem::Requirement
+  requirement: &70131120425320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
-  version_requirements: *70143628397480
+  version_requirements: *70131120425320
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70143628396340 !ruby/object:Gem::Requirement
+  requirement: &70131120423340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70143628396340
+  version_requirements: *70131120423340
 - !ruby/object:Gem::Dependency
   name: vagrant
-  requirement: &70143628394900 !ruby/object:Gem::Requirement
+  requirement: &70131120422500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70143628394900
+  version_requirements: *70131120422500
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70143628389600 !ruby/object:Gem::Requirement
+  requirement: &70131120421680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>'
@@ -143,10 +143,10 @@ dependencies:
         version: '2.4'
   type: :development
   prerelease: false
-  version_requirements: *70143628389600
+  version_requirements: *70131120421680
 - !ruby/object:Gem::Dependency
   name: growl
-  requirement: &70143628388180 !ruby/object:Gem::Requirement
+  requirement: &70131120420900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,10 +154,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70143628388180
+  version_requirements: *70131120420900
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70143628386520 !ruby/object:Gem::Requirement
+  requirement: &70131120420060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,10 +165,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70143628386520
+  version_requirements: *70131120420060
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70143628385940 !ruby/object:Gem::Requirement
+  requirement: &70131120419040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -176,10 +176,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70143628385940
+  version_requirements: *70131120419040
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &70143628385060 !ruby/object:Gem::Requirement
+  requirement: &70131120406900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -187,10 +187,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70143628385060
+  version_requirements: *70131120406900
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70143628384240 !ruby/object:Gem::Requirement
+  requirement: &70131120405840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -198,15 +198,14 @@ dependencies:
         version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: *70143628384240
+  version_requirements: *70131120405840
 description: Ruby wrappers around MelissaData objects
 email:
 - johnnyt@xan.do
 - cwyckoff@alliancehealth.com
 executables:
-- md_tcp_server
 - md_unix_server
-- upload
+- md_tcp_server
 extensions: []
 extra_rdoc_files: []
 files:
@@ -297,8 +296,6 @@ files:
 - spec/melissadata/vagrant_plugin/actions/install_spec.rb
 - spec/melissadata/vagrant_plugin/config_spec.rb
 - spec/spec_helper.rb
-- templates/md_tcp_server
-- templates/md_unix_server
 - Vagrantfile
 homepage: http://github.com/johnnyt/melissadata
 licenses: []

data/templates/md_tcp_server

@@ -1,82 +0,0 @@
-#! /bin/sh
-
-### BEGIN INIT INFO
-# Provides:          md_tcp_server
-# Required-Start:    $all
-# Required-Stop:     $all
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Starts the MelissaData TCP server
-# Description:       Starts the MelissaData TCP server
-### END INIT INFO
-
-NAME=md_tcp_server
-SCRIPTNAME=/etc/init.d/$NAME
-DAEMON=/usr/bin/$NAME
-PID_FILE=/var/run/$NAME.pid
-RUNASUSER=vagrant
-ARGS=""
-
-# Define LSB log_* functions.
-# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
-. /lib/lsb/init-functions
-
-# Function that starts the daemon/service
-do_start() {
-  start-stop-daemon \
-    --start --background \
-    --make-pidfile --pidfile $PID_FILE \
-    --chuid $RUNASUSER \
-    --exec $DAEMON -- $ARGS || true
-}
-
-# Function that stops the daemon/service
-do_stop() {
-  start-stop-daemon --stop --pidfile $PID_FILE
-}
-
-case "$1" in
-  start)
-        [ "$VERBOSE" != no ] && log_daemon_msg "Starting $NAME"
-        do_start
-        case "$?" in
-                0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-                2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-        esac
-        ;;
-  stop)
-        [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $NAME"
-        do_stop
-        case "$?" in
-                0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-                2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-        esac
-        ;;
-
-  restart)
-        do_stop
-        case "$?" in
-          0|1)
-                do_start
-                case "$?" in
-                        0) log_end_msg 0 ;;
-                        1) log_end_msg 1 ;; # Old process is still running
-                        *) log_end_msg 1 ;; # Failed to start
-                esac
-                ;;
-
-          *)
-                # Failed to stop
-                log_end_msg 1
-                ;;
-        esac
-        ;;
-
-  *)
-        log_action_msg "Usage: $SCRIPTNAME {start|stop|restart}" >&2
-        exit 3
-        ;;
-esac
-
-exit 0
-

data/templates/md_unix_server

@@ -1,81 +0,0 @@
-#! /bin/sh
-
-### BEGIN INIT INFO
-# Provides:          md_unix_server
-# Required-Start:    $all
-# Required-Stop:     $all
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Starts the MelissaData UnixSocket server
-# Description:       Starts the MelissaData UnixSocket server
-### END INIT INFO
-
-NAME=md_unix_server
-SCRIPTNAME=/etc/init.d/$NAME
-DAEMON=/usr/bin/$NAME
-PID_FILE=/var/run/$NAME.pid
-RUNASUSER=vagrant
-ARGS=""
-
-# Define LSB log_* functions.
-# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
-. /lib/lsb/init-functions
-
-# Function that starts the daemon/service
-do_start() {
-  start-stop-daemon \
-    --start --background \
-    --make-pidfile --pidfile $PID_FILE \
-    --chuid $RUNASUSER \
-    --exec $DAEMON -- $ARGS || true
-}
-
-# Function that stops the daemon/service
-do_stop() {
-  start-stop-daemon --stop --pidfile $PID_FILE
-}
-
-case "$1" in
-  start)
-        [ "$VERBOSE" != no ] && log_daemon_msg "Starting $NAME"
-        do_start
-        case "$?" in
-                0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-                2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-        esac
-        ;;
-  stop)
-        [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $NAME"
-        do_stop
-        case "$?" in
-                0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-                2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-        esac
-        ;;
-
-  restart)
-        do_stop
-        case "$?" in
-          0|1)
-                do_start
-                case "$?" in
-                        0) log_end_msg 0 ;;
-                        1) log_end_msg 1 ;; # Old process is still running
-                        *) log_end_msg 1 ;; # Failed to start
-                esac
-                ;;
-
-          *)
-                # Failed to stop
-                log_end_msg 1
-                ;;
-        esac
-        ;;
-
-  *)
-        log_action_msg "Usage: $SCRIPTNAME {start|stop|restart}" >&2
-        exit 3
-        ;;
-esac
-
-exit 0