loom 0.0.43 → 0.0.45

data/VERSION

@@ -1 +1 @@
-0.0.43
+0.0.45

data/bin/loom

@@ -3,7 +3,7 @@
 if(ENV['LIB_DIR'])
   $LOAD_PATH << File.expand_path(ENV['LIB_DIR']) 
 else
-  $LOAD_PATH << "./lib"
+  $LOAD_PATH << "#{File.expand_path(File.dirname(__FILE__))}/../lib"
 end
 
 require 'rubygems'

data/lib/helper.rb

@@ -52,6 +52,14 @@ end
 # into the project
 def ensure_sdk_imported!
 
+  sdk_version = config["sdk_version"]
+
+  say "Checking for sdk #{sdk_version}"
+  if !sdk_installed? sdk_version
+    say "Couldn't find the #{sdk_version} sdk, downloading it'"
+    install_remote_sdk sdk_version
+  end
+
   # if the sdk artifacts are already here then we don't need to
   # do anything
   return if(File.exists?("LoomDemo.app") && File.directory?("bin"))
@@ -109,7 +117,7 @@ def configure_directory(dir)
 	say "Configuring Project..."
 
     loom_config = { 
-      :sdk_version => "0.0.1"
+      :sdk_version => "cocos"
     }
 
     config_path = ""
@@ -209,10 +217,51 @@ def list_installed_sdks()
   exit(0)
 end
 
+def install_remote_sdk(sdk_version)
+  sdk_path = File.join(LOOM_DIR, "sdks", sdk_version)
+  say "Downloading remote loom SDK..."
+  temp_file = download_sdk(sdk_version)
+  say "Installing remote loom SDK..."
+  unzip_file(temp_file, sdk_path)
+  File.delete(temp_file)
+  say_tab 1, "SDK installed. You can type 'loom use #{sdk_version}' in the future to use this SDK."
+end
+
+def get_default_sdk
+  get_global_config("default_sdk")
+end
+
+def set_default_sdk(sdk_version)
+  set_global_config("default_sdk", sdk_version)
+  say "Default SDK set to #{sdk_version}"
+end
+
+def installed_sdks
+
+  sdks = Array.new
+
+  Dir.foreach(File.join(LOOM_DIR, "sdks")) do |sdk|
+    is_directory = File.directory?(File.join(LOOM_DIR, "sdks", sdk))
+
+    if is_directory && sdk != "." && sdk != ".."
+      sdks << sdk
+    end
+  end
+
+  return sdks
+end
+
 def sdk_installed?(version)
   File.directory?(File.join(LOOM_DIR, "sdks", version))
 end
 
+def get_local_config(key)
+  ensure_configured!
+
+  loom_config = Loom::Config.load CONFIG_PATH
+  loom_config[key]
+end
+
 def set_local_config(key, value)
   ensure_configured!
 
@@ -221,6 +270,11 @@ def set_local_config(key, value)
   loom_config.save! CONFIG_PATH
 end
 
+def get_global_config(key)
+  loom_config = Loom::Config.load GLOBAL_CONFIG_PATH
+  loom_config[key]
+end
+
 def set_global_config(key, value)
   loom_config = Loom::Config.load GLOBAL_CONFIG_PATH
   loom_config[key] = value

data/lib/loom/run.rb

@@ -5,8 +5,11 @@ command :run do |c|
   c.description = ''
   c.example 'run your loom app', 'loom run'
 
+  setup_env c
+
   c.action do |args, options|
 
+    setup_host options
     ensure_sdk_imported!
 
     loom_config = Loom::Config.load CONFIG_PATH

data/lib/loom/sdk.rb

@@ -26,7 +26,7 @@ command :sdk do |c|
       when "search"
         search_for_sdk(args, options)
       when "default"
-        set_default_sdk(args, options)
+        set_default(args, options)
       when "list", nil
         list_installed_sdks
       else
@@ -37,7 +37,7 @@ command :sdk do |c|
 
 end
 
-def set_default_sdk(args, options)
+def set_default(args, options)
 
   sdk_version = args.shift unless args.nil?
 
@@ -49,9 +49,7 @@ def set_default_sdk(args, options)
     exit 1
   end
 
-  set_global_config("default_sdk", sdk_version)
-
-  say "Default SDK set to #{sdk_version}"
+  set_default_sdk(sdk_version)
 
 end
 
@@ -81,18 +79,18 @@ def install_sdk(args, options)
   # if the sdk doesn't already exists
   if !File.directory?(sdk_path)
     if options.local.nil?
-      say "Downloading remote loom SDK..."
-      temp_file = download_sdk(sdk_version)
-      say "Installing remote loom SDK..."
-      unzip_file(temp_file, sdk_path)
-      File.delete(temp_file)
-      say_tab 1, "SDK installed. You can type 'loom use #{sdk_version}' in the future to use this SDK."
+      install_remote_sdk sdk_version
     else
       say "Installing local loom SDK..."
       unzip_file(options.local, sdk_path)
       say_tab 1, "SDK installed. You can type 'loom use #{sdk_version}' in the future to use this SDK."
     end
   end
+
+  # if this is the first installed sdk, set it as default
+  if get_default_sdk.nil?
+    set_default_sdk sdk_version
+  end
 end
 
 def uninstall_sdk(args, options)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: loom
 version: !ruby/object:Gem::Version
-  version: 0.0.43
+  version: 0.0.45
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-07 00:00:00.000000000 Z
+date: 2012-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -200,7 +200,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4584131822068820033
+      hash: -3593096211022723736
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: