starlark_compiler 0.3.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 663c6958d605dfe906b15293619e97fff4040f4fa57568b88c5d76a343a04083
-  data.tar.gz: c04c32107df5dfd72be317e48f3f6b96683a21c02b648c8e1f8932859c9b8072
+  metadata.gz: b487b7ec8f95d4d08b340c2e6872d38606a3cda406c44189e04cfcc55829ae7b
+  data.tar.gz: ebf0df91ab7dffdab555150b9f0e6ecb44b6faea915fb55bd052bd482da4e0be
 SHA512:
-  metadata.gz: 7cfa2e574e4a1be840990253089e61680d58232e9370af894e1cbb502ff8ba1aa145961c2161dd157e0c5d49cdf9bbdf1e2618cbb2c4b0ee18ee146a5dc2e59a
-  data.tar.gz: d12126d5aecf51ff166c650372620b6171791df5704aea2cf7a8e8e5d5cb68730cd2d0a42c892ec7b58a9c82128893fbc0b51f89cebc1e0f3835f92d3bd96d95
+  metadata.gz: 8db37b777d13cbf3b29ecd9e138d6dc80240f2338226b9b57a29d4abae31f420935b25ed151ec14d975e724103e547b29d8d8cc3ebd965dbcfc62d11e6b23d00
+  data.tar.gz: '0040583536df2b938c70f3c2ce39f3230be444adfa6bd9c365b9ae42808ee2db1dbc895bc66a8b2d000e9eee0d5d6879cb08a3354ee8be1b32d227b0bc106d49'

data/.github/workflows/tests.yml

@@ -0,0 +1,21 @@
+name: Tests
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+
+jobs:
+  integration_tests:
+    name: Build and Test
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "2.6" # Version range or exact version of a Ruby version to use, using semvers version range syntax.
+      - name: Install Gems
+        run: bundle install
+      - name: Build and Test
+        run: bundle exec rake

data/.vscode/launch.json

@@ -0,0 +1,23 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "RSpec - active spec file only",
+            "type": "Ruby",
+            "request": "launch",
+            "useBundler": true,
+            "pathToBundler": "/Users/yuanfeng/.rvm/gems/ruby-2.6.1/wrappers/bundle",
+            "pathToRDebugIDE": "/Users/yuanfeng/.rvm/gems/ruby-2.6.1/gems/ruby-debug-ide-0.7.2",
+            "debuggerPort": "1240",
+            "program": "/Users/yuanfeng/.rvm/gems/ruby-2.6.1/bin/rspec",
+            "args": [
+                "-I",
+                "${workspaceRoot}",
+                "${file}"
+            ]
+        }
+    ]
+}

data/CHANGELOG.md

@@ -0,0 +1,7 @@
+0.5.0
+
+* Update gemspec for compatibility with Ruby 3.x
+
+0.4.0
+
+* Add variable assignment and reference ability

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    starlark_compiler (0.3.0)
+    starlark_compiler (0.5.0)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -20,9 +20,9 @@ Or install it yourself as:
     $ gem install starlark_compiler
 
 ## Usage
-
+The following code:
 ```ruby
-starlark_string = StarlarkCompiler::AST.build do
+ast = StarlarkCompiler::AST.build do
   ast = StarlarkCompiler::AST.new(toplevel: [])
   ast << function_call(
     'load',
@@ -39,20 +39,48 @@ starlark_string = StarlarkCompiler::AST.build do
     'ios_library',
     name: string('App_Objc'),
     srcs: function_call('glob', array([string('Sources/**/*.swift')])) +
-       ['A.swift']
+        ['A.swift']
   )
+  ast << variable_assignment('deps', array([':App_Objc'])
+  ast << variable_assignment('numbers', array([1,2,3]))
   ast << function_call(
     'ios_application',
     name: string('App'),
-    deps: array([
-                  string(':App_Objc')
-                ]),
+    deps: variable_reference('deps'),
     entitlements: array([string(':App.entitlements')])
   )
-  StarlarkCompiler::Writer.write(ast: ast, io: +'')
+  ast
 end
+starlark_string = StarlarkCompiler::Writer.write(ast: ast, io: +'')
+```
+will populate `starlark_string` with:
+```python
+load(
+    "@bazel_build_rules_apple//rules:ios.bzl",
+    "ios_application",
+    _ios_application = "ios_application",
+)
+load("@bazel_build_rules_apple//rules:ios.bzl", "ios_application")
+
+ios_library(
+    name = "App_Objc",
+    srcs = glob(["Sources/**/*.swift"]) + ["A.swift"],
+)
+
+deps = [":App_Objc"]
+
+numbers = [
+    1, 
+    2, 
+    3,
+]
+
+ios_application(
+    name = "App",
+    deps = deps,
+    entitlements = [":App.entitlements"],
+)
 ```
-
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/starlark_compiler/ast.rb

@@ -46,6 +46,8 @@ module StarlarkCompiler
     end
 
     class Node
+      TYPE = :Expression
+
       %i[- + / * % == < <= >= >].each do |op|
         define_method(op) { |rhs| BinaryOperator.new(self, rhs, operator: op) }
       end
@@ -73,7 +75,7 @@ module StarlarkCompiler
         when Numeric
           Number.new(obj)
         else
-          raise Error, "#{obj.inspect} not convertible to Node"
+          raise Error, "Ruby stdlib type #{obj.inspect} not convertible to Node"
         end
       end
     end
@@ -101,6 +103,17 @@ module StarlarkCompiler
       end
     end
 
+    class VariableReference < Node
+      attr_reader :var
+      def initialize(var)
+        unless var.is_a?(::String)
+          raise "Variable Reference must be a string, not #{var.class}"
+        end
+
+        @var = var
+      end
+    end
+
     class Array < Node
       attr_reader :elements
       def initialize(elements)
@@ -108,6 +121,19 @@ module StarlarkCompiler
       end
     end
 
+    class VariableAssignment < Node
+      TYPE = :Statement
+      attr_reader :name, :var
+      def initialize(name, var)
+        @name = name
+        if node(var).class::TYPE != :Expression
+          raise "Unsupported type on rhs for assignment: #{var.class}"
+        end
+
+        @var = node(var)
+      end
+    end
+
     class FunctionCall < Node
       attr_reader :name, :args, :kwargs
       def initialize(name, *args, **kwargs)
@@ -117,6 +143,16 @@ module StarlarkCompiler
       end
     end
 
+    class FunctionDeclaration < Node
+      attr_reader :name, :args, :body, :kwargs
+      def initialize(name, args, body, **kwargs)
+        @name = name
+        @args = args.map(&method(:node))
+        @body = body.map(&method(:node))
+        @kwargs = kwargs.transform_values(&method(:node))
+      end
+    end
+
     class MethodCall < Node
     end
 

data/lib/starlark_compiler/build_file.rb

@@ -8,6 +8,7 @@ module StarlarkCompiler
     def initialize(package:, workspace: Dir.pwd)
       @loads = Hash.new { |h, k| h[k] = Set.new }
       @targets = {}
+      @variable_assignments = {}
       @package = package
       @workspace = workspace
       @path = File.join(@workspace, @package, 'BUILD.bazel')
@@ -26,6 +27,10 @@ module StarlarkCompiler
       @targets[name] = function_call
     end
 
+    def add_variable_assignment(name:, var:)
+      @variable_assignments[name] = var
+    end
+
     def save!
       File.open(@path, 'w') do |f|
         Writer.write(ast: to_starlark, io: f)
@@ -36,10 +41,14 @@ module StarlarkCompiler
       loads = @loads
               .sort_by { |k, _| k }
               .map { |f, fn| AST.build { function_call('load', f, *fn.sort) } }
+      variable_assignments = @variable_assignments
+                             .map do |name, var|
+                               AST.build { variable_assignment(name, var) }
+                             end
       targets = @targets
                 .sort_by { |k, _| k }
                 .map { |_f, fn| normalize_function_call_kwargs(fn) }
-      AST.new(toplevel: loads + targets)
+      AST.new(toplevel: loads + variable_assignments + targets)
     end
 
     private

data/lib/starlark_compiler/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module StarlarkCompiler
-  VERSION = '0.3.0'
+  VERSION = '0.5.0'
 end

data/lib/starlark_compiler/writer.rb

@@ -97,6 +97,36 @@ module StarlarkCompiler
       io << ')'
     end
 
+    def write_function_declaration(declaration)
+      io << 'def ' << declaration.name << '('
+      final_index = declaration.args.size.pred
+      declaration.args.each_with_index do |arg, idx|
+        indented(single_line: false) do |indenter|
+          indenter.write_newline
+          write_node(arg)
+          indenter.write_comma unless final_index == idx
+        end
+      end
+      write_newline
+      io << '):'
+      final_index = declaration.body.size.pred
+      declaration.body.each do |arg|
+        indented(single_line: false) do |indenter|
+          indenter.write_newline
+          write_node(arg)
+        end
+      end
+    end
+
+    def write_variable_reference(variable)
+      io << variable.var
+    end
+
+    def write_variable_assignment(assignment)
+      io << assignment.name << ' = '
+      write_node(assignment.var)
+    end
+
     def write_array(array)
       single_line = single_line?(array)
       io << '['
@@ -203,5 +233,9 @@ module StarlarkCompiler
       dictionary.elements.size <= 1 &&
         dictionary.elements.each_key.all?(&method(:single_line?))
     end
+
+    def single_line_variable_reference?(_)
+      true
+    end
   end
 end

data/starlark_compiler.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '~> 2.6'
+  spec.required_ruby_version = '>= 2.6'
 
   spec.add_development_dependency 'bundler', '~> 2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: starlark_compiler
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Samuel Giddins
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-02-13 00:00:00.000000000 Z
+date: 2023-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -24,17 +24,19 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-description: 
+description:
 email:
 - segiddins@segiddins.me
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/tests.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
+- ".vscode/launch.json"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock
@@ -55,13 +57,13 @@ licenses:
 metadata:
   homepage_uri: https://github.com/segiddins/starlark_compiler
   source_code_uri: https://github.com/segiddins/starlark_compiler
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
@@ -70,8 +72,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
-signing_key: 
+rubygems_version: 3.4.1
+signing_key:
 specification_version: 4
 summary: A starlark gem
 test_files: []

data/.travis.yml

@@ -1,7 +0,0 @@
----
-sudo: false
-language: ruby
-cache: bundler
-rvm:
-  - 2.6.1
-before_install: gem install bundler -v 2.0.2