sf_cli 1.0.0.beta3 → 1.0.0.beta5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7bbf9d5241f6fcaadbcd5777b5396d1d25f52488d61559a5f674dde6e1fc0a2
-  data.tar.gz: 275ce4a1ed1e10c4f96e38bdb48e3258dd5e21c440269e552951377b7d76fd1f
+  metadata.gz: d0d747d19bb4e6c437c2314d83d2e11e138b8f3e241a43a59556fa7fad0829f6
+  data.tar.gz: 9474614d2da8a4bf6b7bc297d81d3221b90a13a65dba0727c1aa8067418bf37b
 SHA512:
-  metadata.gz: f8db2418276d2a496aa2dc3d594eebc8444b217af660a3f5ce4f5741edd4e00d13530f526ec64c771ba405d4ad4844592845679510872f98e2437f48f8249ad4
-  data.tar.gz: e6b77f34683b31776332c719ef313693108e4f9243acc2c2dfd7acf1264e55c60b583a95c10e3be6c2d2cfeffc516cc8eba58755b2df62404db6d49f086b4d34
+  metadata.gz: 951b09d44c48730ddb22fbe60b54b58179a4c5b34d42e2b374f5a68c291c1d5514dc735cd6a7585840cfaec1936d4b9187ab6846472d870142e502ddec1e8368
+  data.tar.gz: 4636eb0848036329af68fb63aec261e4eee191147d6c4327b4cc6ad4f4d516a8ae3c59239af0d969a0cbdc6ce6d8979e00984f90770167fe37e369bce2b3434c

data/lib/sf_cli/console/commands.rb

@@ -8,27 +8,32 @@ module SfCli
   module Console
     #
     # Developer Console commands
-    # @example
-    #  $ bundle exec rake irb[your_target_org]
-    #  irb(main):001> gen :Account, :Contact  # generate Account and Contact class
-    #  => [:Account, :Contact]
-    #
-    #  irb(main):002> Account.describe.label
-    #  => "Account"
-    #
-    #  irb(main):003> apex "System.debug('abc');" # execute Apex code
-    #  => returns the result
     #
     module Commands
-      def use(_target_org)
-        target_org = _target_org.to_sym == :default ? nil : _target_org
+      def use(target_org)
         org_info = sf.org.display target_org: target_org
+        #sf.org.login_web target_org: target_org, instance_url: org_info.instance_url unless org_info.connected?
+
         conn = SfCli::Sf::Model::SfCommandConnection.new target_org: target_org, instance_url: org_info.instance_url
+        conn.open unless org_info.connected?
+
         SfCli::Sf::Model.set_connection conn
+
+        available_models.each do |model|
+          Object.const_get(model).connection = conn
+        end
+
+        true
+      end
+
+      def available_models
+        @available_models ||= []
       end
 
       def generate(*object_types)
         SfCli::Sf::Model.generate object_types
+        available_models.append(*object_types).flatten
+        object_types
       end
 
       def connection
@@ -45,8 +50,63 @@ module SfCli
         sf.apex.run target_org: target_org, file: StringIO.new(apex_code)
       end
 
+      def query(soql)
+        conf.inspect_mode = false
+        puts sf.data.query(soql, format: :human, target_org: target_org)
+        conf.inspect_mode = true
+      end
+
       alias :gen  :generate
       alias :conn :connection
+
+      def help(command = nil)
+        conf.inspect_mode = false
+        puts <<~HELP
+          Available commands:
+            use   --- set current org. If you use your default org, this isn't needed.
+            gen   --- generate Object model classes
+            query --- Query by SOQL with human readable format
+            apex  --- run Apex code
+            conn  --- show current connection setting
+
+          Syntax:
+            [use]
+              use target-org
+
+              parameters:
+                targat-org --- Username or alias of the org you are going to use.
+
+            [gen]
+              gen object-name, object-name, ...
+              generate object-name, object-name, ...
+
+              parameters:
+                object-name --- Comma separated Names. Symbol or String can be OK. At least 1 object name is required. 
+
+              example:
+                gen :Account, :Contact, :User
+
+            [query]
+              query SOQL
+
+                parameters:
+                  SOQL --- soql
+
+            [apex]
+              apex apex_code
+
+              parameters:
+                apex code --- Apex code you want to execute
+
+              example:
+                apex "System.debug('abc');"
+
+            [conn]
+                conn
+                connection
+        HELP
+        conf.inspect_mode = true
+      end
     end
   end
 end

data/lib/sf_cli/sf/org/display.rb

@@ -1,6 +1,10 @@
 module SfCli::Sf::Org
   module Display
-    ConnectionInfo = Struct.new(:id, :access_token, :alias, :instance_url, :user_name, :api_version, :status)
+    ConnectionInfo = Struct.new(:id, :access_token, :alias, :instance_url, :user_name, :api_version, :status) do
+        def connected?
+          status == 'Connected'
+        end
+      end
 
     #
     # Returns the org's connection information

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sf_cli
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta3
+  version: 1.0.0.beta5
 platform: ruby
 authors:
 - Takanobu Maekawa