cf 0.1.5 → 0.6.0.rc1

data/lib/cf/cli/start/target_interactions.rb

@@ -0,0 +1,37 @@
+module CF::Start
+  module TargetInteractions
+    def ask_organization
+      orgs = client.organizations(:depth => 0)
+
+      if orgs.empty?
+        unless quiet?
+          line
+          line c("There are no organizations.", :warning)
+          line "You may want to create one with #{c("create-org", :good)}."
+        end
+      elsif orgs.size == 1 && !input.interactive?(:organization)
+        orgs.first
+      else
+        ask("Organization",
+            :choices => orgs.sort_by(&:name),
+            :display => proc(&:name))
+      end
+    end
+
+    def ask_space(org)
+      spaces = org.spaces(:depth => 0)
+
+      if spaces.empty?
+        unless quiet?
+          line
+          line c("There are no spaces in #{b(org.name)}.", :warning)
+          line "You may want to create one with #{c("create-space", :good)}."
+        end
+      elsif spaces.size == 1 && !input.interactive?(:spaces)
+        spaces.first
+      else
+        ask("Space", :choices => spaces, :display => proc(&:name))
+      end
+    end
+  end
+end

data/lib/cf/cli/start/targets.rb

@@ -0,0 +1,16 @@
+require "cf/cli/start/base"
+
+module CF::Start
+  class Targets < Base
+    desc "List known targets."
+    group :start, :hidden => true
+    def targets
+      targets_info.each do |target, _|
+        line target
+        # TODO: print org/space
+      end
+    end
+  end
+end
+
+

data/lib/cf/cli/user/base.rb

@@ -0,0 +1,29 @@
+require "cf/cli"
+
+module CF
+  module User
+    class Base < CLI
+      def precondition
+        check_logged_in
+      end
+
+      private
+
+      def validate_password!(password)
+        validate_password_verified!(password)
+        validate_password_strength!(password)
+      end
+
+      def validate_password_verified!(password)
+        fail "Passwords do not match." unless force? || password == input[:verify]
+      end
+
+      def validate_password_strength!(password)
+        strength = client.base.password_score(password)
+        msg = "Your password strength is: #{strength}"
+        fail msg if strength == :weak
+        line msg
+      end
+    end
+  end
+end

data/lib/cf/cli/user/create.rb

@@ -0,0 +1,39 @@
+require "cf/cli/user/base"
+
+module CF::User
+  class Create < Base
+    desc "Create a user"
+    group :admin, :user, :hidden => true
+    input :email, :desc => "User email", :argument => :optional
+    input :password, :desc => "User password"
+    input :verify, :desc => "Repeat password"
+    def create_user
+      email = input[:email]
+      password = input[:password]
+
+      if !force? && password != input[:verify]
+        fail "Passwords don't match."
+      end
+
+      with_progress("Creating user") do
+        client.register(email, password)
+      end
+    end
+
+    alias_command :add_user, :create_user
+
+    private
+
+    def ask_email
+      ask("Email")
+    end
+
+    def ask_password
+      ask("Password", :echo => "*", :forget => true)
+    end
+
+    def ask_verify
+      ask("Verify Password", :echo => "*", :forget => true)
+    end
+  end
+end

data/lib/cf/cli/user/passwd.rb

@@ -0,0 +1,43 @@
+require "cf/cli/user/base"
+
+module CF::User
+  class Passwd < Base
+    desc "Update a user's password"
+    group :admin, :user, :hidden => true
+    input :user, :desc => "User to update", :argument => :optional,
+          :default => proc { client.current_user },
+          :from_given => proc { |email|
+            if client.current_user.email != email
+              fail "You can only change your own password."
+            end
+          }
+    input :password, :desc => "Current password"
+    input :new_password, :desc => "New password"
+    input :verify, :desc => "Repeat new password"
+    def passwd
+      user = input[:user]
+      password = input[:password]
+      new_password = input[:new_password]
+
+      validate_password! new_password
+
+      with_progress("Changing password") do
+        user.change_password!(new_password, password)
+      end
+    end
+
+    private
+
+    def ask_password
+      ask("Current Password", :echo => "*", :forget => true)
+    end
+
+    def ask_new_password
+      ask("New Password", :echo => "*", :forget => true)
+    end
+
+    def ask_verify
+      ask("Verify Password", :echo => "*", :forget => true)
+    end
+  end
+end

data/lib/cf/cli/user/register.rb

@@ -0,0 +1,42 @@
+require "cf/cli/user/base"
+
+module CF::User
+  class Register < Base
+    def precondition; end
+
+    desc "Create a user and log in"
+    group :admin, :user, :hidden => true
+    input :email, :desc => "Desired email", :argument => :optional
+    input :password, :desc => "Desired password"
+    input :verify, :desc => "Repeat password"
+    input :login, :desc => "Automatically log in?", :default => true
+    def register
+      email = input[:email]
+      password = input[:password]
+
+      validate_password!(password)
+
+      with_progress("Creating user") do
+        client.register(email, password)
+      end
+
+      if input[:login]
+        invoke :login, :username => email, :password => password
+      end
+    end
+
+    private
+
+    def ask_email
+      ask("Email")
+    end
+
+    def ask_password
+      ask("Password", :echo => "*", :forget => true)
+    end
+
+    def ask_verify
+      ask("Confirm Password", :echo => "*", :forget => true)
+    end
+  end
+end

data/lib/cf/cli/user/users.rb

@@ -0,0 +1,32 @@
+require "cf/cli/user/base"
+
+module CF::User
+  class Users < Base
+    desc "List all users"
+    group :admin, :hidden => true
+    def users
+      users =
+        with_progress("Getting users") do
+          client.users(:depth => 0)
+        end
+
+      spaced(users) do |u|
+        display_user(u)
+      end
+    end
+
+    private
+
+    def display_user(u)
+      if quiet?
+        puts u.email
+      else
+        line "#{c(u.email, :name)}:"
+
+        indented do
+          line "admin?: #{c(u.admin?, u.admin? ? :yes : :no)}"
+        end
+      end
+    end
+  end
+end

data/lib/cf/constants.rb

@@ -1,10 +1,13 @@
 module CF
-  OLD_TARGET_FILE = "~/.vmc_target"
-  OLD_TOKENS_FILE = "~/.vmc_token"
+  OLD_TARGET_FILE = "~/.cf_target".freeze
+  OLD_TOKENS_FILE = "~/.cf_token".freeze
 
-  CONFIG_DIR = "~/.cf"
-  PLUGINS_FILE = "#{CONFIG_DIR}/plugins.yml"
-  TARGET_FILE = "#{CONFIG_DIR}/target"
-  TOKENS_FILE = "#{CONFIG_DIR}/tokens.yml"
-  CRASH_FILE = "#{CONFIG_DIR}/crash"
+  CONFIG_DIR = "~/.cf".freeze
+
+  LOGS_DIR = "#{CONFIG_DIR}/logs".freeze
+  PLUGINS_FILE = "#{CONFIG_DIR}/plugins.yml".freeze
+  TARGET_FILE = "#{CONFIG_DIR}/target".freeze
+  TOKENS_FILE = "#{CONFIG_DIR}/tokens.yml".freeze
+  COLORS_FILE = "#{CONFIG_DIR}/colors.yml".freeze
+  CRASH_FILE = "#{CONFIG_DIR}/crash".freeze
 end

data/lib/cf/detect.rb

@@ -1,64 +1,129 @@
+require "set"
+
+require "clouseau"
+
 module CF
   class Detector
+    # "Basic" framework names for a detected language
+    PSEUDO_FRAMEWORKS = {
+      :node => "node",
+      :python => "wsgi",
+      :java => "java_web",
+      :php => "php",
+      :erlang => "otp_rebar",
+      :dotnet => "dotNet"
+    }
+
+    # Mismatched framework names
+    FRAMEWORK_NAMES = {
+      :rails => "rails3"
+    }
+
+    # Clouseau language symbol => matching runtime names
+    LANGUAGE_RUNTIMES = {
+      :ruby => /^ruby.*/,
+      :java => /^java.*/,
+      :node => /^node.*/,
+      :erlang => /^erlang.*/,
+      :dotnet => /^dotNet.*/,
+      :python => /^python.*/,
+      :php => /^php.*/
+    }
+
     def initialize(client, path)
       @client = client
       @path = path
     end
 
-    def all_frameworks
-      info = @client.info
-      info["frameworks"] || {}
+    # detect the framework
+    def detect_framework
+      detected && frameworks[detected]
     end
 
-    def frameworks
-      info = @client.info
-
-      matches = {}
-      all_frameworks.each do |name, meta|
-        matched = false
-
-        # e.g. standalone has no detection
-        next if meta["detection"].nil?
-
-        meta["detection"].first.each do |file, match|
-          files =
-            if File.file? @path
-              if File.fnmatch(file, @path)
-                [@path]
-              else
-                []
-              end
-            else
-              Dir.glob("#@path/#{file}")
-            end
-
-          unless files.empty?
-            if match == true
-              matched = true
-            elsif match == false
-              matched = false
-              break
-            else
-              files.each do |f|
-                contents = File.open(f, &:read)
-                if contents =~ Regexp.new(match)
-                  matched = true
-                end
-              end
-            end
-          end
-        end
-
-        if matched
-          matches[name] = meta
-        end
+    # detect the language and return the appropriate runtimes
+    def detect_runtimes
+      if detected && lang = detected.language_name
+        runtimes_for(lang)
+      else
+        []
+      end
+    end
+
+    # determine runtimes for a given framework based on the language its
+    # detector reports itself as
+    def runtimes(framework)
+      if detector = detectors[framework]
+        runtimes_for(detector.language_name)
+      else
+        []
       end
+    end
 
-      if matches.size == 1
-        default = matches.keys.first
+    # determine suitable memory allocation via the framework's detector
+    def suggested_memory(framework)
+      if detector = detectors[framework]
+        detector.memory_suggestion
       end
+    end
+
+    # helper so that this is cached somewhere
+    def all_runtimes
+      @all_runtimes ||= @client.runtimes
+    end
 
-      [matches, default]
+    # helper so that this is cached somewhere
+    def all_frameworks
+      @all_frameworks ||= @client.frameworks
+    end
+
+    def detected
+      @detected ||= Clouseau.detect(@path)
+    end
+
+    private
+
+    def map_detectors!
+      @framework_detectors = {}
+      @detector_frameworks = {}
+
+      Clouseau.detectors.each do |d|
+        name = d.framework_name
+        lang = d.language_name
+
+        framework = all_frameworks.find { |f|
+          f.name == name.to_s ||
+            f.name == FRAMEWORK_NAMES[name]
+        }
+
+        framework ||= all_frameworks.find { |f|
+          f.name == PSEUDO_FRAMEWORKS[lang]
+        }
+
+        next unless framework
+
+        @framework_detectors[framework] = d
+        @detector_frameworks[d] = framework
+      end
+
+      nil
+    end
+
+    # Framework -> Detector
+    def detectors
+      map_detectors! unless @framework_detectors
+      @framework_detectors
+    end
+
+    # Detector -> Framework
+    def frameworks
+      map_detectors! unless @detector_frameworks
+      @detector_frameworks
+    end
+
+    def runtimes_for(language)
+      all_runtimes.select do |r|
+        LANGUAGE_RUNTIMES[language] === r.name
+      end
     end
   end
 end

data/lib/cf/errors.rb

@@ -0,0 +1,17 @@
+module CF
+  class UserError < RuntimeError
+    def initialize(msg)
+      @message = msg
+    end
+
+    def to_s
+      @message
+    end
+  end
+
+  class NotAuthorized < UserError
+    def initialize
+      @message = "Not authorized."
+    end
+  end
+end