melissadata 0.1.0 → 0.1.1

data/Gemfile.lock

@@ -15,7 +15,7 @@ GIT
 PATH
   remote: .
   specs:
-    melissadata (0.0.1)
+    melissadata (0.1.0)
       activesupport
       awesome_print
       cloudfiles
@@ -33,6 +33,7 @@ GEM
     awesome_print (0.4.0)
     cloudfiles (1.4.17)
       mime-types (>= 1.16)
+    coderay (0.9.8)
     columnize (0.3.4)
     diff-lcs (1.1.2)
     erubis (2.7.0)
@@ -47,6 +48,8 @@ GEM
     json (1.5.3)
     linecache19 (0.5.12)
       ruby_core_source (>= 0.1.4)
+    method_source (0.6.0)
+      ruby_parser (>= 2.0.5)
     mime-types (1.16)
     msgpack (0.4.6)
     msgpack-rpc (0.4.5)
@@ -56,6 +59,11 @@ GEM
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
     net-ssh (2.1.4)
+    pry (0.9.3)
+      coderay (>= 0.9.8)
+      method_source (>= 0.6.0)
+      ruby_parser (>= 2.0.5)
+      slop (~> 1.9.0)
     rake (0.9.2)
     rev (0.3.2)
       iobuffer (>= 0.1.3)
@@ -77,9 +85,13 @@ GEM
       ruby-debug-base19 (>= 0.11.19)
     ruby_core_source (0.1.5)
       archive-tar-minitar (>= 0.5.2)
+    ruby_parser (2.2.0)
+      sexp_processor (~> 3.0)
+    sexp_processor (3.0.6)
     simplecov (0.4.2)
       simplecov-html (~> 0.4.4)
     simplecov-html (0.4.5)
+    slop (1.9.1)
     thor (0.14.6)
     virtualbox (0.9.1)
       ffi (~> 1.0.9)
@@ -92,6 +104,7 @@ DEPENDENCIES
   growl
   guard-rspec
   melissadata!
+  pry
   rake
   rspec (> 2.4)
   ruby-debug19

data/Guardfile

@@ -1,4 +1,6 @@
 guard 'rspec', :cli => '--format documentation' do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/.+\.rb$}) { "spec" }
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/.+\.rb$}) { "spec" }
   # watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }

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

@@ -25,11 +25,19 @@ module MelissaData::VagrantPlugin::Actions
 
         unless source_paths_and_names.empty?
           source_paths_and_names.each do |source_path,name|
-            Dir["#{source_path}/linux/gcc34_64bit/*.h"].each{ |filename| copy_file filename, 'src' }
+            Dir["#{source_path}/linux/gcc34_64bit/*.h"].each do |filename|
+              sudo "rm -f #{target_root}/src/#{File.basename(filename)}"
+              copy_file filename, 'src'
+            end
+            sudo "rm -f #{target_root}/lib/libmd#{name}.so"
             copy_file "#{source_path}/linux/gcc34_64bit/libmd#{name}.so", 'lib'
+            sudo "rm -f #{target_root}/src/md#{name}RubyWrapper.cpp"
             copy_file "#{source_path}/linux/interfaces/ruby/md#{name}RubyWrapper.cpp", 'src'
-            # Dir["#{source_path}/data/*"].each{ |filename| copy_file filename, 'data' }
-            Dir["#{source_path}/data/*"].each{ |filename| copy_dir filename, 'data' }
+
+            Dir["#{source_path}/data/*"].each do |filename|
+              sudo "rm -rf #{target_root}/data/#{File.basename(filename)}"
+              copy_dir filename, 'data'
+            end
           end
 
           env.ui.info I18n.t("vagrant.plugins.melissadata.compiling"), :prefix => false

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

@@ -0,0 +1,45 @@
+module MelissaData::VagrantPlugin::Actions
+
+  class Upload < Base
+    def call(env)
+      @vm = env['vm']
+      if @vm.created? && @vm.vm.running?
+        target_root = env['config'].melissadata.target_path
+        env.ui.info I18n.t("vagrant.plugins.melissadata.updating"), :prefix => false
+
+
+        #   objects.each do |obj|
+        #     data_file = "#{dest_dir}/#{obj}.tgz"
+        #     inside "#{source_dir}/#{obj}" do
+        #       run "tar czf #{data_file} data"
+        #     end
+
+        #     say_status :upload, "#{obj}.tgz to #{options[:bucket_name]}"
+        #     cf = CloudFiles::Connection.new(:username => options[:username], :api_key => options[:api_key])
+        #     cont = cf.container options[:bucket_name]
+        #     remote_object = cont.create_object "#{obj}.tgz", false
+        #     remote_object.load_from_filename data_file
+
+        #     # "#{source_dir}/#{obj}/linux/gcc34_64bit/*.h" => /opt/melissadata/src/
+        #     # "#{source_dir}/#{obj}/linux/gcc34_64bit/libmdEmail.so" => /opt/melissadata/lib/
+        #     # "#{source_dir}/#{obj}/linux/interfaces/ruby/mdEmailRubyWrapper.cpp" => /opt/melissadata/lib/
+
+        #     # inside "#{source_dir}/#{obj}/linux/gcc34_64bit" do
+        #     #   run "tar czf #{data_file} data"
+        #     # end
+        #   end
+
+
+        sudo "gem uninstall melissadata" if test? "ruby -r md -e 'puts MD::VERSION'" #%Q!ruby -e 'require "rubygems"; require "melissadata"'!
+        gem_filename = "melissadata-#{MelissaData::VERSION}.gem"
+        copy_file "#{File.expand_path("pkg/#{gem_filename}", MelissaData.gem_root)}"
+        sudo "gem install #{target_root}/#{gem_filename} && rm #{target_root}/#{gem_filename}"
+      else
+        env.ui.error "Vagrant VM is not running", :prefix => false
+      end
+
+      @app.call(env)
+    end
+  end
+
+end

data/lib/melissadata/version.rb

@@ -1,3 +1,3 @@
 module MelissaData
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/melissadata.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec', '>2.4'
   s.add_development_dependency 'growl'
   s.add_development_dependency 'guard-rspec'
+  s.add_development_dependency 'pry'
 
   if RUBY_VERSION =~ /1\.9/
     s.add_development_dependency 'ruby-debug19'

data/spec/melissadata/cli_spec.rb

@@ -7,28 +7,5 @@ module MelissaData
       @klass = MelissaData::CLI
     end
 
-    context "registering" do
-      it "registers a base command as a single invokable" do
-        base = Class.new(MelissaData::Command::Base)
-        name = "__test_registering_single_subcommand"
-        @klass.register(base, name, name, "A description")
-        @klass.tasks[name].should_not be_blank
-
-        # assert @klass.tasks[name]
-      end
-
-      it "aliases methods if the alias option is given" do
-        base = Class.new(MelissaData::Command::Base) do
-          def execute
-            raise "WORKED"
-          end
-        end
-
-        name = "__test_registering_with_alias"
-        @klass.register(base, name, name, "A description", :alias => "--ALIAS")
-        lambda { @klass.start(["--ALIAS"]) }.should raise_error(RuntimeError)
-      end
-    end
-
   end
 end

data/spec/melissadata/client/vagrant_spec.rb

@@ -0,0 +1,15 @@
+require "spec_helper"
+
+module MelissaData::Client
+
+  describe Vagrant do
+    before :each do
+      @client = Vagrant.new
+    end
+
+    it "returns the correct version" do
+      @client.version.should == MelissaData::VERSION
+    end
+  end
+
+end

data/spec/spec_helper.rb

@@ -12,6 +12,7 @@ Bundler.setup
 # # Add this folder to the load path for "spec_helper"
 # $:.unshift(File.dirname(__FILE__))
 
+require 'active_support/core_ext'
 require 'vagrant/test_helpers'
 require 'melissadata'
 

data/templates/md_tcp_server

@@ -0,0 +1,82 @@
+#! /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

@@ -0,0 +1,81 @@
+#! /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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: melissadata
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-12 00:00:00.000000000Z
+date: 2011-08-31 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2153081560 !ruby/object:Gem::Requirement
+  requirement: &2156880480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153081560
+  version_requirements: *2156880480
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2153081140 !ruby/object:Gem::Requirement
+  requirement: &2156880060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153081140
+  version_requirements: *2156880060
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2153080720 !ruby/object:Gem::Requirement
+  requirement: &2156879580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153080720
+  version_requirements: *2156879580
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &2153102820 !ruby/object:Gem::Requirement
+  requirement: &2156879140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153102820
+  version_requirements: *2156879140
 - !ruby/object:Gem::Dependency
   name: msgpack-rpc
-  requirement: &2153102400 !ruby/object:Gem::Requirement
+  requirement: &2156878580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153102400
+  version_requirements: *2156878580
 - !ruby/object:Gem::Dependency
   name: awesome_print
-  requirement: &2153101980 !ruby/object:Gem::Requirement
+  requirement: &2156878040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153101980
+  version_requirements: *2156878040
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &2153101560 !ruby/object:Gem::Requirement
+  requirement: &2156877400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153101560
+  version_requirements: *2156877400
 - !ruby/object:Gem::Dependency
   name: cloudfiles
-  requirement: &2153101140 !ruby/object:Gem::Requirement
+  requirement: &2156876680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153101140
+  version_requirements: *2156876680
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2153100720 !ruby/object:Gem::Requirement
+  requirement: &2156876260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153100720
+  version_requirements: *2156876260
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153100220 !ruby/object:Gem::Requirement
+  requirement: &2156875680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>'
@@ -121,10 +121,10 @@ dependencies:
         version: '2.4'
   type: :development
   prerelease: false
-  version_requirements: *2153100220
+  version_requirements: *2156875680
 - !ruby/object:Gem::Dependency
   name: growl
-  requirement: &2153099800 !ruby/object:Gem::Requirement
+  requirement: &2156871880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153099800
+  version_requirements: *2156871880
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &2153099340 !ruby/object:Gem::Requirement
+  requirement: &2156871400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +143,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153099340
+  version_requirements: *2156871400
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: &2156870980 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2156870980
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &2153098880 !ruby/object:Gem::Requirement
+  requirement: &2156870520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,10 +165,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153098880
+  version_requirements: *2156870520
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2153098380 !ruby/object:Gem::Requirement
+  requirement: &2156870020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,7 +176,7 @@ dependencies:
         version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: *2153098380
+  version_requirements: *2156870020
 description: Ruby wrappers around MelissaData objects
 email:
 - johnnyt@xan.do
@@ -242,6 +253,7 @@ files:
 - lib/melissadata/vagrant_plugin/actions/base.rb
 - lib/melissadata/vagrant_plugin/actions/install.rb
 - lib/melissadata/vagrant_plugin/actions/update.rb
+- lib/melissadata/vagrant_plugin/actions/upload.rb
 - lib/melissadata/vagrant_plugin/actions.rb
 - lib/melissadata/vagrant_plugin/command.rb
 - lib/melissadata/vagrant_plugin/config.rb
@@ -251,16 +263,20 @@ files:
 - locales/en.yml
 - melissadata.gemspec
 - pkg/melissadata-0.0.1.gem
+- pkg/melissadata-0.1.0.gem
 - Rakefile
 - README.md
 - spec/helpers/vagrant_helpers.rb
 - spec/locales/en.yml
 - spec/melissadata/cli_spec.rb
+- spec/melissadata/client/vagrant_spec.rb
 - spec/melissadata/command/package_spec.rb
 - spec/melissadata/env_spec.rb
 - 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: []
@@ -282,7 +298,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Ruby wrappers around MelissaData objects