sakusei 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c5167b69a1150bb93726449a31f46408381ae14f26c0034e472a3ce6b22ee3f
-  data.tar.gz: b2187d77e9222b69d927da57ed085cb876e7e0aa7e2c2f556bf4bbfc9e8bbc1b
+  metadata.gz: d1912283c38c05cc3a9f23d05a0ac73eca6846943ee32af42952478e6db89a04
+  data.tar.gz: 7d96c876d140e466e81e7aa6a34f4cb8f0a113da11b70ee454edd755469944ae
 SHA512:
-  metadata.gz: b15a0b12a135ce5eec0d4ab4afa9db615abac32405656456b15ac66d612a13fb8bcfaea564824be18d74a201a947f8ba4d21e5f40a591cf6c90c59589d8443f2
-  data.tar.gz: c9c3dcfa53b2fd665a614414cae22502d830e618c3018b32b00fe314ea5b200d91569483e0c31e5c095862e0999c03ae67d4a8e148b56e2a151007bec8ec6c50
+  metadata.gz: 015ce01c509c0b73107501e9a0ab8c0167b032ad3b51712b1c3f511c79dc7687ace68f0f4871972f7efd691642d8a7e72d99114c65f5abe74a97ed9b56bcc873
+  data.tar.gz: 574528be0428bfd65b7d6bf473febc0c202c26c6677d3e6a33bdd9cc582394537e7bca141a956e2824d30a1f40231ce2f4f54ab165ddf6b108bb84d80ba1ec9a

data/lib/sakusei/cli.rb

@@ -83,7 +83,8 @@ module Sakusei
       else
         say 'Available style packs:', :green
         style_packs.each do |pack|
-          say "  • #{pack[:name]}"
+          label = pack[:default] ? " (default)" : ''
+          say "  • #{pack[:name]}#{label}"
           say "    Path: #{pack[:path]}", :cyan
         end
       end
@@ -92,6 +93,16 @@ module Sakusei
       exit 1
     end
 
+    desc 'set-style NAME', 'Set the default style pack'
+    option :directory, aliases: '-d', default: '.', desc: 'Directory to search for .sakusei'
+    def set_style(name)
+      StylePack.set_default(options[:directory], name)
+      say "Default style pack set to '#{name}'", :green
+    rescue Error => e
+      say_error e.message
+      exit 1
+    end
+
     desc 'components [STYLE]', 'List available Vue components'
     option :directory, aliases: '-d', default: '.', desc: 'Directory to search for style packs'
     def components(style = nil)

data/lib/sakusei/style_pack.rb

@@ -1,11 +1,13 @@
 # frozen_string_literal: true
 
 require 'set'
+require 'yaml'
 
 module Sakusei
   class StylePack
     STYLE_PACKS_DIR = 'style_packs'
     SAKUSEI_DIR = '.sakusei'
+    SAKUSEI_CONFIG = 'config.yml'
 
     attr_reader :name, :path, :config, :stylesheet, :header, :footer
 
@@ -24,16 +26,46 @@ module Sakusei
     def self.discover(start_dir, requested_name = nil)
       sakusei_path = find_sakusei_dir(start_dir)
 
-      if sakusei_path
-        packs_dir = File.join(sakusei_path, STYLE_PACKS_DIR)
-        return load_from_path(packs_dir, requested_name) if Dir.exist?(packs_dir)
+      # Resolve name: explicit arg takes priority, then config default
+      resolved_name = requested_name
+      resolved_name ||= read_config(sakusei_path)['default_style'] if sakusei_path
+
+      if resolved_name
+        # Built-in 'default' pack requested explicitly — skip to fallback below
+        unless resolved_name == 'default'
+          # Search across ALL .sakusei dirs in the tree (not just the nearest),
+          # so a named pack in a parent dir is found even if a child .sakusei
+          # directory exists but has no style_packs/ subdirectory.
+          pack_entry = list_available(start_dir).find { |p| p[:name] == resolved_name }
+          raise Error, "Style pack '#{resolved_name}' not found. Run 'sakusei styles' to see available packs." unless pack_entry
+          return new(pack_entry[:path], pack_entry[:name])
+        end
+      else
+        # No name at all: use the first pack from the nearest .sakusei
+        if sakusei_path
+          packs_dir = File.join(sakusei_path, STYLE_PACKS_DIR)
+          return load_from_path(packs_dir, nil) if Dir.exist?(packs_dir)
+        end
       end
 
-      # Fall back to default style pack
+      # Fall back to built-in default style pack
       default_path = File.expand_path('../templates/default_style_pack', __dir__)
       new(default_path, 'default')
     end
 
+    # Set the default style pack in the nearest .sakusei/config.yml
+    def self.set_default(start_dir, style_name)
+      sakusei_path = find_sakusei_dir(start_dir)
+      raise Error, "No .sakusei directory found. Run 'sakusei init' to create a style pack first." unless sakusei_path
+
+      available = list_available(start_dir)
+      unless available.any? { |p| p[:name] == style_name }
+        raise Error, "Style pack '#{style_name}' not found. Run 'sakusei styles' to see available packs."
+      end
+
+      write_config(sakusei_path, 'default_style' => style_name)
+    end
+
     # Initialize a new style pack
     def self.init(directory, name)
       sakusei_path = File.join(directory, SAKUSEI_DIR)
@@ -204,6 +236,7 @@ module Sakusei
     # List all available style packs
     def self.list_available(start_dir = '.')
       packs = []
+      nearest_sakusei_path = nil
 
       # Find all .sakusei directories walking up from start_dir
       current = File.expand_path(start_dir)
@@ -212,6 +245,7 @@ module Sakusei
       loop do
         sakusei_path = File.join(current, SAKUSEI_DIR)
         if Dir.exist?(sakusei_path) && !visited_dirs.include?(sakusei_path)
+          nearest_sakusei_path ||= sakusei_path
           visited_dirs.add(sakusei_path)
           packs_dir = File.join(sakusei_path, STYLE_PACKS_DIR)
           if Dir.exist?(packs_dir)
@@ -233,11 +267,29 @@ module Sakusei
 
       # Remove duplicates by name (closer packs take precedence)
       seen_names = Set.new
-      packs.select { |p| seen_names.add?(p[:name]) }
+      unique_packs = packs.select { |p| seen_names.add?(p[:name]) }
+
+      # Mark whichever pack is set as default in config
+      default_name = nearest_sakusei_path ? read_config(nearest_sakusei_path)['default_style'] : nil
+      unique_packs.map { |p| p.merge(default: p[:name] == default_name) }
     end
 
     private
 
+    def self.read_config(sakusei_dir)
+      config_path = File.join(sakusei_dir, SAKUSEI_CONFIG)
+      return {} unless File.exist?(config_path)
+      YAML.safe_load(File.read(config_path)) || {}
+    rescue Psych::Exception
+      {}
+    end
+
+    def self.write_config(sakusei_dir, data)
+      config_path = File.join(sakusei_dir, SAKUSEI_CONFIG)
+      existing = read_config(sakusei_dir)
+      File.write(config_path, YAML.dump(existing.merge(data)))
+    end
+
     def self.find_sakusei_dir(start_dir)
       current = File.expand_path(start_dir)
 

data/lib/sakusei/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Sakusei
-  VERSION = '0.2.0'
+  VERSION = '0.2.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sakusei
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Keith Rowell