rhoconnect 3.0.0.rc1 → 3.0.0

data/spec/store_spec.rb

@@ -48,7 +48,42 @@ describe "Store" do
         Store.put_data('mydata', data)
         Store.get_data('mydata').should == data
       end
-
+      
+      it "should update_objects with simple data and one changed attribute" do
+        data = { '1' => { 'hello' => 'world', "attr1" => 'value1' } }
+        update_data = { '1' => {'attr1' => 'value2'}}
+        Store.put_data('mydata', data)
+        Store.get_data('mydata').should == data
+        Store.update_objects('mydata', update_data)        
+        data['1'].merge!(update_data['1'])
+        Store.get_data('mydata').should == data
+      end
+      
+      it "should update_objects with simple data and verify that srem and sadd is called only on affected fields" do
+        data = { '1' => { 'hello' => 'world', "attr1" => 'value1' } }
+        update_data = { '1' => {'attr1' => 'value2', 'new_attr' => 'new_val', 'hello' => 'world'},
+                        '2' => {'whole_new_object' => 'new_value' } }
+        Store.put_data('mydata', data)
+        Store.db.should_receive(:srem).exactly(1).times
+        Store.db.should_receive(:sadd).exactly(3).times
+        Store.update_objects('mydata', update_data)        
+      end
+      
+      it "should delete_objects with simple data" do
+        data = { '1' => { 'hello' => 'world', "attr1" => 'value1' } }
+        Store.put_data('mydata', data)
+        Store.delete_objects('mydata', ['1'])
+        Store.get_data('mydata').should == {}
+      end
+      
+      it "should delete_objects with simple data and verify that srem is called only on affected fields" do
+        data = { '1' => { 'hello' => 'world', "attr1" => 'value1' } }
+        Store.put_data('mydata', data)
+        Store.db.should_receive(:srem).exactly(2).times
+        Store.db.should_receive(:sadd).exactly(0).times
+        Store.delete_objects('mydata', ['1'])        
+      end
+      
       it "should add simple array data to new set" do
         @data = ['1','2','3']
         Store.put_data(@s.docname(:md),@data).should == true

data/tasks/redis.rake

@@ -68,6 +68,18 @@ class RedisRunner
       sh command
     end
   end
+  
+  # this function is used with Rhostudio where there is no terminal
+  def self.startbg
+  	if windows?
+  		puts "Starting redis in a new window..."
+  		sh "start #{File.join(redis_home,'redis-server')} #{File.join(redis_home,'redis.conf')}" rescue
+  			"redis-server not installed on your path, please run 'rake redis:install' first."
+    else
+      puts "Starting redis ..."
+      system("redis-server #{redisconfdir} &")
+    end
+  end
 
   def self.attach
     exec "dtach -a #{dtach_socket}"
@@ -90,6 +102,11 @@ namespace :redis do
   task :start do
     RedisRunner.start
   end
+  
+#  desc 'Start redis' without dtach - for Rhostudio (internal)
+  task :startbg do
+    RedisRunner.startbg
+  end
 
   desc 'Stop redis'
   task :stop do

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rhoconnect
 version: !ruby/object:Gem::Version 
-  hash: 15424119
-  prerelease: 6
+  hash: 7
+  prerelease: 
   segments: 
   - 3
   - 0
   - 0
-  - rc
-  - 1
-  version: 3.0.0.rc1
+  version: 3.0.0
 platform: ruby
 authors: 
 - Rhomobile
@@ -17,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-27 00:00:00 Z
+date: 2011-09-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :runtime
@@ -187,7 +185,7 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files: 
-- CHANGELOG
+- CHANGELOG.md
 - CREDITS
 - Gemfile
 - Gemfile.lock
@@ -311,6 +309,7 @@ files:
 - generators/templates/application/spec/spec_helper.rb
 - generators/templates/source/source_adapter.rb
 - generators/templates/source/source_spec.rb
+- installer/unix-like/create_texts.rb
 - installer/unix-like/post_install.sh
 - installer/unix-like/post_uninstall.sh
 - installer/unix-like/pre_install.sh
@@ -324,8 +323,9 @@ files:
 - installer/unix-like/rho_connect_install_utilities.rb
 - installer/unix-like/rho_connect_install_yum.rb
 - installer/unix-like/rhoinstaller.rb
-- installer/utils/create_texts.rb
-- installer/utils/install_test.rb
+- installer/utils/constants.rb
+- installer/utils/nix_installation.rake
+- installer/utils/unix_install_test.rb
 - installer/windows/configUi.ini
 - installer/windows/EnvVarUpdate.nsh
 - installer/windows/icon.ico

data/installer/utils/install_test.rb

@@ -1,152 +0,0 @@
-#! /usr/bin/env ruby
-
-require 'rhoconnect/version'
-require 'rubygems'
-require 'fog'
-require 'readline'
-require 'optparse'
-
-# CONSTANTS
-
-REGION          = 'us-west-1'
-SLEEP           = 45
-SSH_KEY         = '/home/mike/.ssh/alexdevkey.pem'
-SCP_KEY         = '/home/mike/.scp/alexdevkey.pem'
-ACCESS_KEY_FILE = '/Users/rhomobile/.ec2'
-LOCAL_FILE      = ''
-REMOTE_FILE     = "/home/#{USER}/rhoconnect"
-UBUNTU_STACK    = { :image_id  => 'ami-3d491a78',
-                    :flavor_id => 'm1.small',
-                    :key_name  => 'alexdevkey',
-                    :groups    => 'load-test',
-                    :user      => 'ubuntu' }                
-CENTOS_STACK    = { :image_id  => 'ami-13346656',
-                    :flavor_id => 'm1.small',
-                    :key_name  => 'alexdevkey',
-                    :groups    => 'load-test',
-                    :user      => 'root' }
-STACKS          = [ UBUNTU_STACK, CENTOS_STACK ]
-
-# METHODS
-
-# cmd
-# easily issue system commands in a clear way
-def cmd(cmd)
-  puts cmd
-  puts `#{cmd}`
-end #cmd
-
-# create_ec2_instance
-# Generates the Fog object and creates a new ec2 instance.
-def create_ec2_instance
-   make_fog
-   start_new_instance
-end #create_ec2_instance
-
-# get_access_keys
-# Retrieves the access key and secret access key from the above specified file.
-def get_access_keys
-  lines = IO.readlines ACCESS_KEY_FILE
-  @access_key = lines.first.strip
-  @secret_access_key = lines.last.strip
-end #get_access_keys
-
-# make_fog
-# Generates the Fog object used to create the new ec2 instance.
-def make_fog
-  get_access_keys
-  @fog = Fog::Compute.new(
-      :provider              => 'AWS',
-      :region                => REGION,
-      :aws_access_key_id     => @access_key,
-      :aws_secret_access_key => @secret_access_key
-  )
-end #make_fog
-
-# start_new_instance
-# Creates a new ec2 instance as per the given stack.
-def start_new_instance(stack)
-  puts "Creating new instance..."
-
-  @server = @fog.servers.create(stack)
-  @server.wait_for { print "."; STDOUT.flush; ready? }
-  puts
-  if @server.ready?
-    # wait for all services to start on remote VM
-    puts "Waiting #{SLEEP} seconds for services to start on remote VM..."
-    SLEEP.times do
-      sleep( 1 )
-      print "."
-      STDOUT.flush
-    end #do
-    puts
-
-    # save important instance information
-    @host      = @server.dns_name
-    @server_id = @server.id
-  else
-    puts "Server timed out."
-    exit
-  end #if
-end #start_new_instance
-
-# establish_ssh_connection
-# Establishes the ssh connection needed to issue commands to the remote machine.
-def establish_ssh_connection
-  @ssh = Fog::SSH.new( @host, USER, :keys => KEYS )
-end #establish_ssh_connection
-
-# establish_scp_connection
-# Establishes a gateway through which to transfer data
-def establish_scp_connection
-  @scp = Fog::SCP.new( @host, USER, :keys => KEYS )
-end #create_scp_connection
-
-# ssh_cmd
-# More easily issue commands over the ssh connection.
-def ssh_cmd(cmd)
-  puts cmd
-  result = @ssh.run(cmd)
-  if result[0] != nil
-    print result[0].stdout
-  end #if
-end #ssh_cmd
-
-# 
-def transfer(local_data, remote_data)
-  puts "Attempting to establish SCP connection..."
-  puts "DATA:  LOCAL - #{local_data}\t REMOTE - #{remote_data}"
-  @scp.upload( local_data, remote_data, :recursive => true ) do |cd, name, sent, total|
-    print "\r#{name}: #{(sent.to_f * 100 / total.to_f).to_i}%"
-  end #do
-  puts
-
-end #establish_scp_connection
-
-# transfer_rhoconnect
-# Transfers over SCP the rhoconnect repo
-def transfer_rhoconnect
-  ssh_cmd [ "sudo mkdir -p #{REMOTE_REPO}", "sudo chmod 777 #{REMOTE_REPO}" ]
-  transfer LOCAL_REPO, "#{REMOTE_REPO}"
-  ssh_cmd "sudo tar -xzf -C #{REMOTE_REPO} #{REMOTE_REPO}/rhoconnect.tgz"
-  ssh_cmd "ls -la #{REMOTE_REPO}"
-end #transfer_rhoconnect
-
-# destroy_ec2_instance
-# Terminates the current ec2 instance
-def destroy_ec2_instance
-  @server.destroy
-  puts "Instance Terminated."
-end #destroy_ec2_instance
-
-# SCRIPT
-
-create_ec2_instance
-
-# Establish connections
-establish_ssh_connection
-establish_scp_connection
-
-transfer_rhoconnect
-
-destroy_ec2_instance